spree_backend 3.0.0.rc1 → 3.0.0.rc3

data/app/views/spree/admin/customer_returns/index.html.erb

@@ -1,13 +1,13 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => Spree.t(:customer_returns) } %>
 
 <% content_for :page_actions do %>
-  <% if @order.shipments.any?(&:shipped?) %>
+  <% if @order.shipments.any?(&:shipped?) && can?(:create, Spree::CustomerReturn) %>
     <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'add', class: 'btn-success' %>
   <% end %>
 <% end %>
 
 <% content_for :page_title do %>
-  / <%= Spree::CustomerReturn.model_name.human(count: :many) %>
+  / <%= plural_resource_name(Spree::CustomerReturn) %>
 <% end %>
 
 <% if @order.shipments.any?(&:shipped?) %>
@@ -37,7 +37,7 @@
               <% end %>
             </td>
             <td class='actions actions-1' data-hook="admin_orders_customer_returns_index_row_actions">
-              <%= link_to_edit_url edit_admin_order_customer_return_path(@order, customer_return), title: "admin_edit_#{dom_id(customer_return)}", no_text: true %>
+              <%= link_to_edit_url(edit_admin_order_customer_return_path(@order, customer_return), title: "admin_edit_#{dom_id(customer_return)}", no_text: true) if can?(:edit, customer_return) %>
             </td>
           </tr>
         <% end %>
@@ -45,8 +45,8 @@
     </table>
   <% else %>
     <div class="alert alert-info no-objects-found">
-      <%= Spree.t(:no_resource_found, resource: Spree::CustomerReturn.model_name.human(count: :many)) %>,
-      <%= link_to Spree.t(:add_one), spree.new_admin_order_customer_return_path(@order) %>!
+      <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::CustomerReturn)) %>,
+      <%= link_to(Spree.t(:add_one), spree.new_admin_order_customer_return_path(@order)) if can?(:create, Spree::CustomerReturn) %>!
     </div>
   <% end %>
 <% else %>

data/app/views/spree/admin/customer_returns/new.html.erb

@@ -44,7 +44,7 @@
       <div class="form-actions" data-hook="buttons">
         <%= button Spree.t(:create), 'save' %>
         <span class="or"><%= Spree.t(:or) %></span>
-        <%= button_link_to Spree.t('actions.cancel'), admin_order_customer_returns_url(@order), :icon => 'delete' %>
+        <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_customer_returns_url(@order), :icon => 'delete' %>
       </div>
     </fieldset>
   <% end %>

data/app/views/spree/admin/general_settings/edit.html.erb

@@ -2,7 +2,7 @@
   <%= Spree.t(:general_settings) %>
 <% end %>
 
-<%= form_tag admin_general_settings_path, :method => :put do %>
+<%= form_tag admin_general_settings_path, method: :put do %>
   <div id="preferences" data-hook>
 
     <fieldset class="general no-border-top">
@@ -13,7 +13,7 @@
             <div class="form-group" data-hook="admin_general_setting_input_name">
               <%= f.label :name %>
               <%= f.text_field :name, class: 'form-control' %>
-            </div>    
+            </div>
           </div>
 
           <div class="col-md-6">
@@ -29,7 +29,7 @@
             <div class="form-group" data-hook="admin_general_setting_input_meta_keywords">
               <%= f.label :meta_keywords %>
               <%= f.text_field :meta_keywords, class: 'form-control'  %>
-            </div>    
+            </div>
           </div>
 
           <div class="col-md-6">
@@ -75,14 +75,14 @@
                   type = Spree::Config.preference_type(key) %>
                   <div class="checkbox">
                     <%= label_tag key do %>
-                      <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
+                      <%= preference_field_tag(key, Spree::Config[key], type: type) %>
                       <%= Spree.t(key) %>
                     <% end %>
                   </div>
-              <% end %>  
+              <% end %>
             </div>
           </div>
-          
+
           <%#-------------------------------------------------%>
           <%# Clear cache                                     %>
           <%#-------------------------------------------------%>
@@ -97,10 +97,10 @@
               </div>
               <div data-hook="general_settings_clear_cache">
                 <%= button Spree.t(:clear_cache), 'ok', 'button', id: "clear_cache" %>
-              </div>    
+              </div>
             </div>
           </div>
-          
+
         </div>
         <div class="col-md-6">
 
@@ -127,7 +127,7 @@
       <div class="form-actions" data-hook="buttons">
         <%= button Spree.t('actions.update'), 'save' %>
         <span class="or"><%= Spree.t(:or) %></span>
-        <%= button_link_to Spree.t('actions.cancel'), edit_admin_general_settings_url, :icon => 'delete' %>
+        <%= button_link_to Spree.t('actions.cancel'), edit_admin_general_settings_url, icon: 'delete' %>
       </div>
 
     </fieldset>

data/app/views/spree/admin/images/edit.html.erb

@@ -22,7 +22,7 @@
         <div class="form-actions" data-hook="buttons">
           <%= button Spree.t('actions.update'), 'save' %>
           <span class="or"><%= Spree.t(:or) %></span>
-          <%= button_link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :icon => 'delete' %>
+          <%= button_link_to Spree.t('actions.cancel'), spree.admin_product_images_url(@product), :id => 'cancel_link', :icon => 'delete' %>
         </div>
       </div>
     </div>

data/app/views/spree/admin/images/index.html.erb

@@ -1,14 +1,14 @@
 <%= render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Images' } %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_image), new_admin_product_image_url(@product), { class: "btn-success", icon: 'add', id: 'new_image_link' } %>
+  <%= button_link_to(Spree.t(:new_image), spree.new_admin_product_image_url(@product), { class: "btn-success", icon: 'add', id: 'new_image_link' }) if can? :create, Spree::Image %>
 <% end %>
 
 <% has_variants = @product.has_variants? %>
 
 <% unless @product.variant_images.any? %>
   <div class="alert alert-warning">
-    <%= Spree.t(:no_resource_found, resource: Spree::Image.model_name.human(count: :many)) %>.
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Image)) %>.
   </div>
 <% else %>
   <table class="table sortable" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
@@ -33,7 +33,9 @@
       <% (@product.variant_images).each do |image| %>
         <tr id="<%= spree_dom_id image %>" data-hook="images_row">
           <td class="move-handle text-center">
-            <span class="icon icon-move handle"></span>
+            <% if can? :edit, image %>
+              <span class="icon icon-move handle"></span>
+            <% end %>
           </td>
           <td class="image">
             <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
@@ -43,8 +45,8 @@
           <% end %>
           <td><%= image.alt %></td>
           <td class="actions actions-2 text-right">
-            <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_product_image_url(@product, image), class: 'btn btn-primary btn-sm', no_text: true, data: { action: 'edit' } %>
-            <%= link_to_delete image, { url: admin_product_image_url(@product, image), no_text: true } %>
+            <%= link_to_with_icon('edit', Spree.t(:edit), spree.edit_admin_product_image_url(@product, image), class: 'btn btn-primary btn-sm', no_text: true, data: { action: 'edit' }) if can? :edit, image %>
+            <%= link_to_delete(image, { url: spree.admin_product_image_url(@product, image), no_text: true }) if can? :destroy, image %>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/images/new.html.erb

@@ -11,7 +11,7 @@
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t('actions.update'), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_product_images_url(@product), icon: 'delete', id: 'cancel_link' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_product_images_url(@product), icon: 'delete', id: 'cancel_link' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/option_types/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree::OptionType.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::OptionType) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -38,7 +38,7 @@
 </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::OptionType.model_name.human(count: :many)) %>,
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::OptionType)) %>,
     <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>

data/app/views/spree/admin/orders/_form.html.erb

@@ -27,26 +27,26 @@
 
   <% if order.line_items.exists? %>
     <div class="alert alert-success" id="order-total" data-hook="order_details_total">
-      <%= Spree.t(:order_total) %>: 
+      <%= Spree.t(:order_total) %>:
       <strong class="order-total">
         <%= order.display_total %>
       </strong>
     </div>
   <% end %>
 
-  <%= javascript_tag do -%>
+  <%= javascript_tag do %>
     var order_number = '<%= @order.number %>';
     var shipments = [];
 
     <% @order.shipments.each do |shipment| %>
       shipments.push(
         <%== shipment.as_json(
-          :root => false, 
+          :root => false,
           :only => [
             :id, :tracking, :number, :state, :stock_location_id
           ], :include => [
             :inventory_units, :stock_location
-          ]).to_json 
+          ]).to_json
         %>
       );
     <% end %>

data/app/views/spree/admin/orders/_line_item.html.erb

@@ -14,7 +14,7 @@
   </td>
   <td data-hook="admin_order_form_line_item_actions" class="actions">
     <%= link_to_delete f.object, { 
-      url: admin_order_line_item_url(@order.number, f.object), 
+      url: spree.admin_order_line_item_url(@order.number, f.object), 
       no_text: true 
     } %>
   </td>

data/app/views/spree/admin/orders/_line_items_edit_form.html.erb

@@ -26,7 +26,7 @@
     </div>
   <% end %>
 
-  <%= javascript_tag do -%>
+  <%= javascript_tag do %>
     var order_number = '<%= @order.number %>';
     var shipments = [];
 
@@ -35,5 +35,5 @@
     <% end %>
 
     <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>
-  <% end -%>
+  <% end %>
 </div>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -13,8 +13,12 @@
         <div class="col-md-8">
           <div class="form-group">
             <%= f.label :email, Spree.t(:email) %>
-            <%= f.email_field :email, class: 'form-control' %>
-          </div>  
+            <% if can? :edit, @order.user %>
+              <%= f.email_field :email, class: 'form-control' %>
+            <% else %>
+              <p><%= @order.user.email %></p>
+            <% end %>
+          </div>
         </div>
         <div class="col-md-4">
           <div class="form-group">
@@ -43,9 +47,9 @@
             <% end %>
           </div>
         </div>
-      </div>  
+      </div>
     </div>
-    
+
   </div>
 
   <div class="row">
@@ -56,9 +60,13 @@
         </div>
 
         <div class="panel-body">
-          <%= f.fields_for :bill_address do |ba_form| %>
-            <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
-          <% end %>  
+          <% if can? :edit, @order.user %>
+            <%= f.fields_for :bill_address do |ba_form| %>
+              <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
+            <% end %>
+          <% else %>
+            <%= render partial: 'spree/admin/shared/address', locals: { address: @order.bill_address } %>
+          <% end %>
         </div>
       </div>
     </div>
@@ -69,26 +77,28 @@
           <h1 class="panel-title"><%= Spree.t(:shipping_address) %></h1>
         </div>
         <div class="panel-body">
-          <%= f.fields_for :ship_address do |sa_form| %>
-            <div class="form-group">
-              <span data-hook="use_billing">
-                <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
-                <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
-              </span>
-            </div>
+          <% if can? :edit, @order.user %>
+            <%= f.fields_for :ship_address do |sa_form| %>
+              <div class="form-group">
+                <span data-hook="use_billing">
+                  <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
+                  <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
+                </span>
+              </div>
 
-            <%= render partial: 'spree/admin/shared/address_form', locals: { f: sa_form, type: 'shipping' } %>
+              <%= render partial: 'spree/admin/shared/address_form', locals: { f: sa_form, type: 'shipping' } %>
+            <% end %>
+          <% else %>
+            <%= render partial: 'spree/admin/shared/address', locals: { address: @order.ship_address } %>
           <% end %>
         </div>
       </div>
     </div>
   </div>
 
-  <div class="form-actions" data-hook="buttons">
-    <%= button Spree.t('actions.update'), 'save' %>
-  </div>
-
-  <% content_for :head do %>
-    <%= javascript_include_tag 'spree/backend/address_states.js' %>
+  <% if can? :edit, @order.user %>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t('actions.update'), 'save' %>
+    </div>
   <% end %>
 </div>

data/app/views/spree/admin/orders/customer_details/edit.html.erb

@@ -4,21 +4,23 @@
   / <%= Spree.t(:customer_details) %>
 <% end %>
 
-<div id="select-customer" class="panel panel-default" data-hook>
-  <div class="panel-heading">
-    <h1 class="panel-title">
-      <%= Spree.t(:customer_search) %>  
-    </h1>
+<% if can? :edit, @order.user %>
+  <div id="select-customer" class="panel panel-default" data-hook>
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= Spree.t(:customer_search) %>
+      </h1>
+    </div>
+    <div class="panel-body">
+      <%= hidden_field_tag :customer_search,  nil, class: 'error-message' %>
+      <%= render partial: "spree/admin/orders/customer_details/autocomplete", formats: :js %>
+    </div>
   </div>
-  <div class="panel-body">
-    <%= hidden_field_tag :customer_search,  nil, class: 'error-message' %>
-    <%= render partial: "spree/admin/orders/customer_details/autocomplete", formats: :js %>
-  </div>
-</div>
+<% end %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @order } %>
 
-<%= form_for @order, url: admin_order_customer_url(@order) do |f| %>
+<%= form_for @order, url: spree.admin_order_customer_url(@order) do |f| %>
   <%= render 'form', f: f %>
 <% end %>
 

data/app/views/spree/admin/orders/edit.html.erb

@@ -10,14 +10,14 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Shipments' } %>
 
 <% content_for :page_title do %>
-  / <%= Spree::Shipment.model_name.human(count: :many) %>
+  / <%= plural_resource_name(Spree::Shipment) %>
 <% end %>
 
 <div data-hook="admin_order_edit_header">
   <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @order } %>
 </div>
 
-<% if @order.payments.exists? && @order.considered_risky? %>
+<% if @order.payments.valid.any? && @order.considered_risky? %>
   <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.valid.last %>
 <% end %>
 

data/app/views/spree/admin/orders/index.html.erb

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree::Order.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::Order) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_order), new_admin_order_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_order' %>
-<% end if can? :edit, Spree::Order.new %>
+<% end if can? :create, Spree::Order %>
 
 <% content_for :table_filter do %>
   <div data-hook="admin_orders_index_search">
@@ -171,7 +171,7 @@
     <tbody>
     <% @orders.each do |order| %>
       <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
-        <td><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
+        <td><%= l (@show_only_completed ? order.completed_at : order.created_at).try(&:to_date) %></td>
         <td><%= link_to order.number, edit_admin_order_path(order) %></td>
         <td>
           <span class="label label-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>">
@@ -216,8 +216,8 @@
   </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::Order.model_name.human(count: :many)) %>,
-    <%= link_to Spree.t(:add_one), new_admin_order_url %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>,
+    <%= link_to(Spree.t(:add_one), new_admin_order_url) if can? :create, Spree::Order %>!
   </div>
 <% end %>
 

data/app/views/spree/admin/payment_methods/index.html.erb

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree::PaymentMethod.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::PaymentMethod) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_payment_method), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_payment_methods_link' %>
-<% end %>
+<% end if can? :create, Spree::PaymentMethod %>
 
 <% if @payment_methods.any? %>
   <table class="table" id='listing_payment_methods'>
@@ -25,8 +25,8 @@
           <td class="text-center"><%= method.display_on.blank? ? Spree.t(:both) : Spree.t(method.display_on) %></td>
           <td class="text-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions actions-2 text-right">
-            <%= link_to_edit method, :no_text => true %>
-            <%= link_to_delete method, :no_text => true  %>
+            <%= link_to_edit(method, :no_text => true) if can? :edit, method %>
+            <%= link_to_delete(method, :no_text => true) if can? :delete, method %>
           </td>
         </tr>
       <% end %>
@@ -34,7 +34,7 @@
   </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::PaymentMethod.model_name.human(count: :many)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::PaymentMethod)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::PaymentMethod %>!
   </div>
 <% end %>

data/app/views/spree/admin/payments/_list.html.erb

@@ -26,9 +26,9 @@
         <td class="actions actions-2 text-center">
           <% payment.actions.each do |action| %>
             <% if action == 'credit' %>
-              <%= link_to_with_icon 'refund', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true, class: "btn btn-default btn-sm" %>
+              <%= link_to_with_icon('refund', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true, class: "btn btn-default btn-sm") if can?(:create, Spree::Refund) %>
             <% else %>
-              <%= link_to_with_icon action, Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: { action: action }, class: "btn btn-default btn-sm" %>
+              <%= link_to_with_icon(action, Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: { action: action }, class: "btn btn-default btn-sm") if can?(action, payment) %>
             <% end %>
           <% end %>
         </td>

data/app/views/spree/admin/payments/index.html.erb

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: "Payments" } %>
 
 <% content_for :page_actions do %>
-  <% if @order.outstanding_balance? %>
+  <% if @order.outstanding_balance? && can?(:create, Spree::Payment) %>
     <span id="new_payment_section">
       <%= button_link_to Spree.t(:new_payment), new_admin_order_payment_url(@order), class: "btn-success", icon: 'add' %>
     </span>

data/app/views/spree/admin/payments/new.html.erb

@@ -20,6 +20,6 @@
 <% else %>
   <div class="alert alert-info">
     <%= Spree.t(:cannot_create_payment_without_payment_methods) %>
-    <%= link_to Spree.t(:please_define_payment_methods), admin_payment_methods_url %>
+    <%= link_to Spree.t(:please_define_payment_methods), spree.admin_payment_methods_url %>
   </div>
 <% end %>

data/app/views/spree/admin/product_properties/_product_property_fields.html.erb

@@ -1,6 +1,6 @@
 <tr class="product_property fields" id="spree_<%= dom_id(f.object) %>" data-hook="product_property">
   <td class="move-handle">
-    <% if f.object.persisted? %>
+    <% if f.object.persisted? && can?(:edit, f.object) %>
       <span class="icon icon-move handle"></span>
       <%= f.hidden_field :id %>
     <% end %>
@@ -12,7 +12,7 @@
     <%= f.text_field :value, class: 'form-control' %>
   </td>
   <td class="actions actions-1">
-    <% if f.object.persisted? %>
+    <% if f.object.persisted? && can?(:destroy, f.object) %>
       <%= link_to_delete f.object, no_text: true %>
     <% end %>
   </td>

data/app/views/spree/admin/product_properties/index.html.erb

@@ -2,11 +2,11 @@
 <%= render 'spree/admin/shared/error_messages', :target => @product %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:add_product_properties), "javascript:;", { :icon => 'add', :'data-target' => "tbody#product_properties", :class => 'btn-success spree_add_fields' } %>
+  <%= button_link_to(Spree.t(:add_product_properties), "javascript:;", { :icon => 'add', :'data-target' => "tbody#product_properties", :class => 'btn-success spree_add_fields' }) %>
   <span class="js-new-ptype-link"><%= button_link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, { :icon => 'properties', :remote => true, 'data-update' => 'prototypes', :class => 'btn-default' } %></span>
-<% end %>
+<% end if can? :create, Spree::ProductProperty %>
 
-<%= form_for @product, :url => admin_product_url(@product), :method => :put do |f| %>
+<%= form_for @product, :url => spree.admin_product_url(@product), :method => :put do |f| %>
   <fieldset>
     <div id="prototypes" data-hook></div>
 
@@ -25,13 +25,13 @@
       </tbody>
     </table>
 
-    <%= render 'spree/admin/shared/edit_resource_links' %>
+    <%= render('spree/admin/shared/edit_resource_links') if can? :update, Spree::ProductProperty %>
 
     <%= hidden_field_tag 'clear_product_properties', 'true' %>
   </fieldset>
 <% end %>
 
-<%= javascript_tag do -%>
+<%= javascript_tag do %>
   var properties = <%= raw(@properties.to_json) %>;
   $('#product_properties').on('keydown', 'input.autocomplete', function() {
     already_auto_completed = $(this).is('ac_input');
@@ -40,4 +40,4 @@
       $(this).focus();
     }
   });
-<% end -%>
+<% end %>

data/app/views/spree/admin/products/_autocomplete.js.erb

@@ -6,7 +6,7 @@
         <span class="caret"></span>
       </button>
       <ul class="dropdown-menu" role="menu" data-hook="taxon_product_dropdown">
-        <li><a href="javascript:;" class="edit-product js-edit-product"><%= Spree.t(:edit_product) %></a></li>
+        <li><a href="javascript:;" class="edit-product js-edit-product"><%= Spree.t(:edit) %></a></li>
         <li><a href="javascript:;" class="delete-product js-delete-product"><%= Spree.t(:delete_from_taxon) %></a></li>
       </ul>
     </div>