From 28de55acce87189bdbf4464178a4e4e657dd9c88 Mon Sep 17 00:00:00 2001
From: aignatov-bio <aignatov@biosistemika.com>
Date: Tue, 22 Oct 2019 13:20:05 +0200
Subject: [PATCH] Fix url variables for manage columns

---
 .../javascripts/repository_columns/index.js      | 16 +++++++++-------
 app/serializers/repository_column_serializer.rb  |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/repository_columns/index.js b/app/assets/javascripts/repository_columns/index.js
index e5ba6f840..1fcc200c3 100644
--- a/app/assets/javascripts/repository_columns/index.js
+++ b/app/assets/javascripts/repository_columns/index.js
@@ -42,23 +42,24 @@ var RepositoryColumns = (function() {
 
 
   function insertNewListItem(column) {
+    var attributes = column.attributes;
     var html = `<li class="list-group-item row" data-id="${column.id}">
 
                   <div class="col-xs-8">
-                    <span class="pull-left column-name">${column.attributes.name}</span>
+                    <span class="pull-left column-name">${attributes.name}</span>
                   </div>
                   <div class="col-xs-4">
                     <span class="controlls pull-right">
-                      <button class="btn btn-default edit-repo-column" 
+                      <button class="btn btn-default edit-repo-column manage-repo-column" 
                               data-action="edit"
-                              data-modal-url="${column.destroy_html_url}"
+                              data-modal-url="${attributes.edit_html_url}"
                       >
                       <span class="fas fa-pencil-alt"></span>
                         ${ I18n.t('libraries.repository_columns.index.edit_column')}
                       </button>
-                      <button class="btn btn-default delete-repo-column" 
+                      <button class="btn btn-default delete-repo-column manage-repo-column" 
                               data-action="destroy"
-                              data-modal-url="${column.destroy_html_url}"
+                              data-modal-url="${attributes.destroy_html_url}"
                       >
                         <span class="fas fa-trash-alt"></span>
                         ${ I18n.t('libraries.repository_columns.index.delete_column')}
@@ -80,8 +81,9 @@ var RepositoryColumns = (function() {
       var url = $('#repository-column-data-type').find(':selected').data('create-url');
       var params = { repository_column: { name: $('#repository-column-name').val() } };
       $.post(url, params, (result) => {
-        insertNewListItem(result.data);
-        HelperModule.flashAlertMsg(result.data.message, 'success');
+        var data = result.data;
+        insertNewListItem(data);
+        HelperModule.flashAlertMsg(data.message, 'success');
         $manageModal.modal('hide');
       }).error((error) => {
         $('#new_repository_column').renderFormErrors('repository_column', error.responseJSON.repository_column, true);
diff --git a/app/serializers/repository_column_serializer.rb b/app/serializers/repository_column_serializer.rb
index 6e280191c..9660781ba 100644
--- a/app/serializers/repository_column_serializer.rb
+++ b/app/serializers/repository_column_serializer.rb
@@ -3,13 +3,13 @@
 class RepositoryColumnSerializer < ActiveModel::Serializer
   include Rails.application.routes.url_helpers
 
-  attributes :id, :name, :message, :edit_url, :update_url, :destroy_html_url
+  attributes :id, :name, :message, :edit_html_url, :update_url, :destroy_html_url
 
   def message
     I18n.t('libraries.repository_columns.create.success_flash', name: object.name)
   end
 
-  def edit_url
+  def edit_html_url
     edit_repository_repository_column_path(object.repository, object)
   end