spree_backend 3.1.0.rc1 → 3.1.0.rc2

data/app/views/spree/admin/stock_transfers/show.html.erb

@@ -1,5 +1,6 @@
 <% content_for :page_title do %>
-  <%= plural_resource_name(Spree::StockTransfer) %> (<%= @stock_transfer.number %>)
+    <%= link_to Spree.t(:stock_transfers), spree.admin_stock_transfers_url %> /
+    <%= @stock_transfer.number %>
 <% end %>
 
 <% content_for :page_actions do %>

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

@@ -1,8 +1,9 @@
 <div data-hook="admin_store_credit_category_form_fields">
-  <div data-hook="store_credit_category_name" class="form-group">
+  <%= f.field_container :name, class: ['form-group'], 'data-hook' => 'store_credit_category_name' do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
     <%= f.text_field :name, class: 'form-control' %>
-  </div>
+    <%= f.error_message_on :name %>
+  <% end %>
 
   <div data-hook="additional_store_credit_category_fields"></div>
 </div>

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

@@ -1,7 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::StoreCreditCategory.model_name.human) %>
+  <%= link_to Spree.t(:store_credit_categories), spree.admin_store_credit_categories_url %> /
+  <%= @store_credit_category.name %>
 <% end %>
 
+<%= render 'spree/admin/shared/error_messages', target: @store_credit_category %>
+
 <%= form_for [:admin, @store_credit_category] do |f| %>
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>

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

@@ -1,7 +1,10 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:store_credit_categories), spree.admin_store_credit_categories_url %> /
   <%= Spree.t(:new_store_credit_category) %>
 <% end %>
 
+<%= render 'spree/admin/shared/error_messages', target: @store_credit_category %>
+
 <%= form_for [:admin, @store_credit_category] do |f| %>
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>

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

@@ -1,9 +1,11 @@
+<%= render partial: 'spree/admin/users/sidebar', locals: { current: :store_credits } %>
+
 <% content_for :page_title do %>
-  <%= link_to "#{@user.email}", spree.edit_admin_user_url(@user) %> / <%= Spree.t(:editing_resource, resource: Spree::StoreCredit.model_name.human) %>
+  <%= link_to @user.email, spree.edit_admin_user_url(@user) %> /
+  <%= link_to Spree.t(:store_credits), spree.admin_user_store_credits_path(@user) %> /
+  <%= Spree.t(:editing_resource, resource: Spree::StoreCredit.model_name.human) %>
 <% end %>
 
-<%= render partial: 'spree/admin/users/sidebar', locals: { current: :store_credits } %>
-
 <%= form_for @store_credit, url: spree.admin_user_store_credit_path(@user, @store_credit) do |f| %>
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>

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

@@ -1,11 +1,11 @@
+<%= render partial: 'spree/admin/users/sidebar', locals: { current: :store_credits } %>
+
 <% content_for :page_title do %>
-  <%= link_to "#{@user.email}", spree.edit_admin_user_url(@user) %> / <%= Spree.t(:"admin.user.store_credits") %>
+  <%= link_to @user.email, spree.edit_admin_user_url(@user) %> /
+  <%= Spree.t(:"admin.user.store_credits") %>
 <% end %>
 
-<%= render partial: 'spree/admin/users/sidebar', locals: { current: :store_credits } %>
-
 <% content_for :page_actions do %>
-  <%= back_to_list_button(Spree.user_class.model_name.human, spree.admin_users_path) %>
   <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-success", icon: 'add' %>
 <% end %>
 

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

@@ -1,9 +1,11 @@
+<%= render partial: 'spree/admin/users/sidebar', locals: { current: :store_credits } %>
+
 <% content_for :page_title do %>
-  <%= link_to "#{@user.email}", spree.edit_admin_user_url(@user) %> / <%= Spree.t(:new_store_credit) %>
+  <%= link_to @user.email, spree.edit_admin_user_url(@user) %> /
+  <%= link_to Spree.t(:store_credits), spree.admin_user_store_credits_path(@user) %> /
+  <%= Spree.t(:add_store_credit) %>
 <% end %>
 
-<%= render partial: 'spree/admin/users/sidebar', locals: { current: :store_credits } %>
-
 <%= form_for @store_credit, url: spree.admin_user_store_credits_path(@user, @store_credit) do |f| %>
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>

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

@@ -2,6 +2,7 @@
   <%= f.field_container :name, :class => ['form-group'] do %>
     <%= f.label :name, Spree.t(:name) %>
     <%= f.text_field :name, :class => 'form-control' %>
+    <%= f.error_message_on :name %>
   <% end %>
 
   <%= f.field_container :tax_code, :class => ['form-group'] do %>

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

@@ -1,9 +1,6 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::TaxCategory.model_name.human) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::TaxCategory.model_name.human, admin_tax_categories_path) %>
+  <%= link_to Spree.t(:tax_categories), spree.admin_tax_categories_url %> /
+  <%= @tax_category.name %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_category } %>

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

@@ -1,11 +1,8 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:tax_categories), spree.admin_tax_categories_url %> /
   <%= Spree.t(:new_tax_category) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::TaxCategory.model_name.human, admin_tax_categories_path) %>
-<% end %>
-
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_category } %>
 
 <%= form_for [:admin, @tax_category] do |f| %>

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

@@ -13,8 +13,11 @@
           <%= f.text_field :name, :class => 'form-control' %>
         </div>
         <div data-hook="rate" class="form-group">
-          <%= f.label :amount, Spree.t(:rate) %>
-          <%= f.text_field :amount, :class => 'form-control' %>
+          <%= f.field_container :amount, class: ["form-group"] do %>
+            <%= f.label :amount, Spree.t(:rate) %>
+            <%= f.text_field :amount, :class => 'form-control' %>
+            <%= f.error_message_on :amount %>
+          <% end %>
           <p class="help-block">
             <%= Spree.t(:tax_rate_amount_explanation) %>
           </p>

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

@@ -1,9 +1,6 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::TaxRate.model_name.human) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::TaxRate.model_name.human, admin_tax_rates_path) %>
+  <%= link_to Spree.t(:tax_rates), spree.admin_tax_rates_url %> /
+  <%= @tax_rate.name %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_rate } %>

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

@@ -1,11 +1,8 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:tax_rates), spree.admin_tax_rates_url %> /
   <%= Spree.t(:new_tax_rate) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::TaxRate.model_name.human, admin_tax_rates_path) %>
-<% end %>
-
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_rate } %>
 
 <%= form_for [:admin, @tax_rate] do |f| %>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_inside_taxonomy_form" class="form-group">
   <%= f.field_container :name, class: ['form-group'] do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
-    <%= error_message_on :taxonomy, :name, :class => 'error-message' %>
-    <%= text_field :taxonomy, :name, :class => 'form-control' %>
+    <%= f.text_field :name, :class => 'form-control' %>
+    <%= f.error_message_on :name, :class => 'error-message' %>
   <% end %>
 </div>

data/app/views/spree/admin/taxonomies/edit.erb

@@ -1,11 +1,8 @@
 <%= render partial: 'js_head' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:taxonomy_edit) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Taxonomy.model_name.human, admin_taxonomies_path) %>
+  <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
+  <%= @taxonomy.name %>
 <% end %>
 
 <div id="ajax_error" class="errorExplanation" style="display:none;"></div>

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

@@ -1,10 +1,8 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
   <%= Spree.t(:new_taxonomy) %>
 <% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Taxonomy.model_name.human, admin_taxonomies_path) %>
-<% end %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @taxonomy } %>
 
 <%= form_for [:admin, @taxonomy] do |f| %>
   <fieldset>

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

@@ -4,7 +4,7 @@
       <%= f.field_container :name, class: ['form-group'] do %>
         <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
         <%= text_field :taxon, :name, :class => 'form-control' %>
-        <%= error_message_on :taxon, :name, :class => 'error-message' %>
+        <%= f.error_message_on :name, :class => 'error-message' %>
       <% end %>
 
       <%= f.field_container :permalink_part, class: ['form-group'] do %>

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

@@ -1,5 +1,7 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:taxon_edit) %>
+  <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
+  <%= link_to @taxonomy.name, spree.edit_admin_taxonomy_url(@taxonomy) %> /
+  <%= @taxon.name %>
 <% end %>
 
 <%# Because otherwise the form would attempt to use to_param of @taxon %>

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

@@ -1,9 +1,10 @@
 <div data-hook="admin_tracker_form_fields" class="row">
-  <div class="col-md-4">
-    <div data-hook="analytics_id" class="form-group">
-      <%= label_tag nil, Spree.t(:google_analytics_id) %>
-      <%= text_field :tracker, :analytics_id, :class => 'form-control' %>
-    </div>
+  <div class="col-md-4" data-hook="analytics_id">
+    <%= f.field_container :analytics_id, class: ["form-group"], "data-hook" => "analytics_id" do %>
+      <%= f.label :analytics_id, Spree.t(:google_analytics_id) %>
+      <%= f.text_field :analytics_id, :class => 'form-control' %>
+      <%= f.error_message_on :analytics_id %>
+    <% end %>
   </div>
   <div class="col-md-4">
     <div data-hook="active" class="form-group">
@@ -18,11 +19,11 @@
         <%= label_tag :tracker_active_false do %>
           <%= radio_button(:tracker, :active, false) %>
           <%= Spree.t(:say_no) %>
-        <% end %>        
+        <% end %>
       </div>
     </div>
   </div>
-  
+
   <div data-hook="additional_tracker_fields"></div>
 
 </div>

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

@@ -1,10 +1,13 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::Tracker.model_name.human) %>
+  <%= link_to Spree.t(:analytics_trackers), spree.admin_trackers_url %> /
+  <%= @tracker.analytics_id %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tracker } %>
 
 <%= form_for [:admin, @tracker] do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>  
+  <fieldset>
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
 <% end %>

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

@@ -1,4 +1,5 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:analytics_trackers), spree.admin_trackers_url %> /
   <%= Spree.t(:new_tracker) %>
 <% end %>
 

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

@@ -3,7 +3,7 @@
     <%= f.field_container :email, class: ['form-group'] do %>
       <%= f.label :email, Spree.t(:email) %>
       <%= f.email_field :email, :class => 'form-control' %>
-      <%= error_message_on :user, :email %>
+      <%= f.error_message_on :email %>
     <% end %>
 
     <div data-hook="admin_user_form_roles" class="form-group">

data/app/views/spree/admin/users/_sidebar.html.erb

@@ -1,3 +1,7 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t(:users), spree.admin_users_path %> /
+<% end %>
+
 <% content_for :sidebar do %>
   <ul class="nav nav-pills nav-stacked" data-hook="admin_user_tab_options">
     <li<%== ' class="active"' if current == :account %>>

data/app/views/spree/admin/users/_user_page_actions.html.erb

@@ -1,4 +1,3 @@
 <% content_for :page_actions do %>
-  <%= back_to_list_button(Spree.user_class.model_name.human, spree.admin_users_path) %>
   <%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id), class: "btn-success", icon: 'add' %>
 <% end %>

data/app/views/spree/admin/users/addresses.html.erb

@@ -1,10 +1,11 @@
-<% content_for :page_title do %>
-  <%= link_to "#{@user.email}", edit_admin_user_url(@user) %> / <%= Spree.t(:editing_resource, resource: plural_resource_name(Spree::Address)) %>
-<% end %>
-
 <%= render partial: 'spree/admin/users/sidebar', locals: { current: :address } %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
 
+<% content_for :page_title do %>
+  <%= link_to @user.email, spree.edit_admin_user_url(@user) %> /
+  <%= Spree.t(:addresses) %>
+<% end %>
+
 <div data-hook="admin_user_addresses" id="admin_user_edit_addresses">
   <div data-hook="admin_user_edit_form_header">
     <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>

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

@@ -1,10 +1,10 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_user) %> <%= @user.email %>
-<% end %>
-
 <%= render partial: 'spree/admin/users/sidebar', locals: { current: :account } %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
 
+<% content_for :page_title do %>
+  <%= @user.email %>
+<% end %>
+
 <div data-hook="admin_user_edit_general_settings" class="panel panel-default">
   <div class="panel-heading">
     <h1 class="panel-title">

data/app/views/spree/admin/users/items.html.erb

@@ -1,10 +1,11 @@
-<% content_for :page_title do %>
-  <%= link_to "#{@user.email}", edit_admin_user_url(@user) %> / <%= Spree.t(:"admin.user.items_purchased") %>
-<% end %>
-
 <%= render partial: 'spree/admin/users/sidebar', locals: { current: :items } %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
 
+<% content_for :page_title do %>
+  <%= link_to @user.email, spree.edit_admin_user_url(@user) %> /
+  <%= Spree.t(:"admin.user.items_purchased") %>
+<% end %>
+
 <fieldset data-hook="admin_user_items_purchased">
   <%= paginate @orders %>
 

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

@@ -1,11 +1,8 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:users), spree.admin_users_url %> /
   <%= Spree.t(:new_user) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree.user_class.model_name.human, admin_users_path) %>
-<% end %>
-
 <div data-hook="admin_user_new_form_header">
   <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @user } %>
 </div>

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

@@ -1,10 +1,11 @@
-<% content_for :page_title do %>
-  <%= link_to "#{@user.email}", edit_admin_user_url(@user) %> / <%= Spree.t(:"admin.user.order_history") %>
-<% end %>
-
 <%= render partial: 'spree/admin/users/sidebar', locals: { current: :orders } %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
 
+<% content_for :page_title do %>
+  <%= link_to @user.email, spree.edit_admin_user_url(@user) %> /
+  <%= Spree.t(:"admin.user.order_history") %>
+<% end %>
+
 <fieldset data-hook="admin_user_order_history">
   <%= paginate @orders %>
 

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

@@ -9,6 +9,7 @@
         <%= zone_form.field_container :name, class: ['form-group'] do %>
           <%= zone_form.label :name, Spree.t(:name) %>
           <%= zone_form.text_field :name, :class => 'form-control' %>
+          <%= zone_form.error_message_on :name %>
         <% end %>
 
         <%= zone_form.field_container :description, class: ['form-group'] do %>

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

@@ -1,5 +1,6 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::Zone.model_name.human) %>
+  <%= link_to Spree.t(:zones), spree.admin_zones_url %> /
+  <%= @zone.name %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @zone } %>

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

@@ -1,4 +1,5 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:zones), spree.admin_zones_url %> /
   <%= Spree.t(:new_zone) %>
 <% end %>
 

data/spec/controllers/spree/admin/resource_controller_spec.rb

@@ -79,17 +79,6 @@ describe Spree::Admin::WidgetsController, :type => :controller do
       expect { subject }.to change { Widget.count }.by(1)
     end
 
-    context 'failure' do
-      let(:params) do
-        {widget: {name: ''}} # blank name generates an error
-      end
-
-      it 'sets a flash error' do
-        subject
-        expect(flash[:error]).to eq assigns(:widget).errors.full_messages.join(', ')
-      end
-    end
-
     context 'without any parameters' do
       let(:params) { {} }
 
@@ -118,20 +107,6 @@ describe Spree::Admin::WidgetsController, :type => :controller do
     it 'updates the resource' do
       expect { subject }.to change { widget.reload.name }.from('a widget').to('widget renamed')
     end
-
-    context 'failure' do
-      let(:params) do
-        {
-          id: widget.to_param,
-          widget: {name: ''}, # a blank name will trigger a validation error
-        }
-      end
-
-      it 'sets a flash error' do
-        subject
-        expect(flash[:error]).to eq assigns(:widget).errors.full_messages.join(', ')
-      end
-    end
   end
 
   describe '#destroy' do
@@ -273,4 +248,3 @@ describe Spree::Admin::Submodule::PostsController, type: :controller do
     end
   end
 end
-