Merge pull request #2184 from nebulab/normalize-data-actions

Fix backend data-action across multiple files

Author: kennyadsl

backend/app/assets/javascripts/spree/backend/number_field_updater.coffee

@@ -19,19 +19,19 @@ class NumberFieldUpdater
 
   toggleReadOnly = (id, show) ->
     toggleButtonVisibility('edit', id, show)
-    toggleButtonVisibility('trash', id, show)
+    toggleButtonVisibility('remove', id, show)
     cssDisplay = if show then 'block' else 'none'
     $("#number-update-#{id} span").css('display', cssDisplay)
 
   toggleForm = (id, show) ->
-    toggleButtonVisibility('void', id, show)
-    toggleButtonVisibility('check', id, show)
+    toggleButtonVisibility('cancel', id, show)
+    toggleButtonVisibility('save', id, show)
     cssDisplay = if show then 'block' else 'none'
     $("#number-update-#{id} input[type='number']").css('display', cssDisplay)
 
-  toggleButtonVisibility = (buttonIcon, id, show) ->
+  toggleButtonVisibility = (buttonAction, id, show) ->
     cssDisplay = if show then 'inline-block' else 'none'
-    $(".fa-#{buttonIcon}[data-id='#{id}']").css('display', cssDisplay)
+    $("[data-action='#{buttonAction}'][data-id='#{id}']").css('display', cssDisplay)
 
   resetInput = (id) ->
     tableCell = $("#number-update-#{id}")

backend/app/assets/javascripts/spree/backend/stock_transfers/count_update_forms.coffee

@@ -1,21 +1,21 @@
 class CountUpdateForms
   @beginListening: (isReceiving) ->
     # Edit
-    $('body').on 'click', '#listing_transfer_items .fa-edit', (ev) =>
+    $('body').on 'click', '#listing_transfer_items [data-action="edit"]', (ev) =>
       ev.preventDefault()
       transferItemId = $(ev.currentTarget).data('id')
       Spree.NumberFieldUpdater.hideReadOnly(transferItemId)
       Spree.NumberFieldUpdater.showForm(transferItemId)
 
     # Cancel
-    $('body').on 'click', '#listing_transfer_items .fa-void', (ev) =>
+    $('body').on 'click', '#listing_transfer_items [data-action="cancel"]', (ev) =>
       ev.preventDefault()
       transferItemId = $(ev.currentTarget).data('id')
       Spree.NumberFieldUpdater.hideForm(transferItemId)
       Spree.NumberFieldUpdater.showReadOnly(transferItemId)
 
     # Submit
-    $('body').on 'click', '#listing_transfer_items .fa-check', (ev) =>
+    $('body').on 'click', '#listing_transfer_items [data-action="save"]', (ev) =>
       ev.preventDefault()
       transferItemId = $(ev.currentTarget).data('id')
       stockTransferNumber = $("#stock_transfer_number").val()

backend/app/assets/javascripts/spree/backend/stock_transfers/transfer_item_deleting.coffee

@@ -1,6 +1,6 @@
 class TransferItemDeleting
   @beginListening: ->
-    $('body').on 'click', '#listing_transfer_items .fa-trash', (ev) =>
+    $('body').on 'click', '#listing_transfer_items [data-action="remove"]', (ev) =>
       ev.preventDefault()
       if confirm(Spree.translations.are_you_sure_delete)
         transferItemId = $(ev.currentTarget).data('id')

backend/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs

@@ -17,8 +17,8 @@
 </td>
 <td class="actions">
   {{#if editing}}
-    <a class="submit fa fa-check icon_link with-tip no-text" data-action="green" href="#"></a>
-    <a class="cancel fa fa-void icon_link with-tip no-text" data-action="red" href="#"></a>
+    <a class="submit fa fa-check icon_link with-tip no-text" data-action="save" href="#"></a>
+    <a class="cancel fa fa-cancel icon_link with-tip no-text" data-action="cancel" href="#"></a>
   {{else}}
     <a class="edit fa fa-edit icon_link with-tip no-text" data-action="edit" href="#"></a>
   {{/if}}

backend/app/assets/javascripts/spree/backend/templates/stock_transfers/transfer_item.hbs

@@ -39,8 +39,8 @@
   </td>
   <td class="actions">
     <a class="fa fa-edit icon_link with-tip no-text" data-action="edit" data-id="{{id}}" href="#"></a>
-    <a class="fa fa-check icon_link with-tip no-text" data-action="green" data-id="{{id}}" href="#"></a>
-    <a class="fa fa-void icon_link with-tip no-text" data-action="red" data-id="{{id}}" href="#"></a>
+    <a class="fa fa-check icon_link with-tip no-text" data-action="save" data-id="{{id}}" href="#"></a>
+    <a class="fa fa-cancel icon_link with-tip no-text" data-action="cancel" data-id="{{id}}" href="#"></a>
     {{#unless isReceiving }}
       <a class="fa fa-trash icon_link with-tip no-text" data-action="remove" data-id="{{id}}" href="#"></a>
     {{/unless}}

backend/app/assets/stylesheets/spree/backend/components/_number_field_update.scss

@@ -1,6 +1,6 @@
 .number-field-update-table {
   td.actions {
-    a.fa-void,
+    a.fa-cancel,
     a.fa-check {
       display: none;
     }

backend/app/views/spree/admin/shared/_number_field_update_actions.html.erb

@@ -1,5 +1,5 @@
 <% if can?(:update, resource) %>
   <%= link_to_with_icon 'edit', Spree.t('actions.edit'), '#', no_text: true, data: { action: 'edit', id: resource.id } %>
-  <%= link_to_with_icon 'check', Spree.t('actions.update'), '#', no_text: true, data: update_data.merge(action: 'green', id: resource.id) %>
-  <%= link_to_with_icon 'void', Spree.t('actions.cancel'), '#', no_text: true, data: { action: 'red', id: resource.id } %>
+  <%= link_to_with_icon 'check', Spree.t('actions.update'), '#', no_text: true, data: update_data.merge(action: 'save', id: resource.id) %>
+  <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), '#', no_text: true, data: { action: 'cancel', id: resource.id } %>
 <% end %>

backend/app/views/spree/admin/stock_items/_stock_management.html.erb

@@ -78,7 +78,7 @@
             <%= number_field_tag :count_on_hand, "", class: 'fullwidth', id: "variant-count-on-hand-#{variant.id}" %>
           </td>
           <td class="actions">
-            <%= link_to_with_icon 'plus', Spree.t('actions.create'), '#', no_text: true, data: {action: 'green' }, class: "submit" %>
+            <%= link_to_with_icon 'plus', Spree.t('actions.create'), '#', no_text: true, data: { action: 'add' }, class: "submit" %>
           </td>
         </tr>
       <% end %>

backend/app/views/spree/admin/stock_transfers/index.html.erb

@@ -101,11 +101,11 @@
           </td>
           <td class="actions">
             <% if stock_transfer.receivable? && can?(:edit, stock_transfer) %>
-              <%= link_to_with_icon 'download', Spree.t('actions.receive'), receive_admin_stock_transfer_path(stock_transfer), no_text: true, data: { action: 'green' } %>
+              <%= link_to_with_icon 'download', Spree.t('actions.receive'), receive_admin_stock_transfer_path(stock_transfer), no_text: true, data: { action: 'receive' } %>
             <% elsif !stock_transfer.closed? && can?(:edit, stock_transfer) %>
               <%= link_to_with_icon 'edit', Spree.t('actions.edit'), stock_transfer_edit_or_ship_path(stock_transfer), no_text: true, data: { action: 'edit' } %>
             <% elsif can?(:show, stock_transfer) %>
-              <%= link_to_with_icon 'eye', Spree.t(:show), admin_stock_transfer_path(stock_transfer), no_text: true, data: { action: 'green' } %>
+              <%= link_to_with_icon 'eye', Spree.t(:show), admin_stock_transfer_path(stock_transfer), no_text: true, data: { action: 'show' } %>
             <% end %>
           </td>
         </tr>

backend/app/views/spree/admin/store_credits/show.html.erb

@@ -67,7 +67,7 @@
     <td class='actions'>
       <% if can?(:update, @store_credit) %>
         <%= link_to '', '#', class: 'js-save-memo fa fa-check no-text with-tip', data: { user_id: @user.id, store_credit_id: @store_credit.id, action: 'save' }, title: Spree.t('actions.save') %>
-        <%= link_to '', '#', class: 'js-cancel-memo fa fa-void no-text with-tip', data: { action: 'void' }, title: Spree.t('actions.cancel') %>
+        <%= link_to '', '#', class: 'js-cancel-memo fa fa-cancel no-text with-tip', data: { action: 'cancel' }, title: Spree.t('actions.cancel') %>
       <% end %>
     </td>
   </tr>