spree_backend 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 183de53cf05b9f4aa814b721bfb761d03c46c30f
-  data.tar.gz: aba76f689a16edec86725e6caad45dff2549931c
+  metadata.gz: 2576b7e7409bd237d0a969011b99430430bd2fe4
+  data.tar.gz: 080fb92f9d02a049ad453e76d017970d5eb1ecb4
 SHA512:
-  metadata.gz: ef7aea1bf5ab20ff81848b0c1717aa613c72d2ca2f1c4b67b522d3caa6ddfc8d831052e1067eb4de42505d17d761a050c6fc9ff42a2eda4b3a9542e575ce7a19
-  data.tar.gz: b057293b4c0ad7c0990f1717c264455cc2a6b1db7308b29cab57c34a0f205b9116255fde57139510ecf6f183420d46546fa9f16d7c9dd20f7fe69edce72b39e6
+  metadata.gz: e5fc4c72e6f3b9aac105215c86fdca50160d1046e50aea638095eaef9da9448eb200a6e829b38ec6add206fe4deccfba66b8a0f333f1f28de8d9e14c241501db
+  data.tar.gz: dc838a7b4114c56e63ed83c29e1a6049e0f2fae92fa15d29d08a338011cc8b0a0c5847900bc5c0a3fc8435f678e229a33bb963c065c78f5cca9de45ddd8ee114

data/app/assets/javascripts/spree/backend/admin.js

@@ -81,9 +81,9 @@ jQuery(function($) {
   });
 
   // Main menu active item submenu show
-  var active_item = $('#sidebar').find('.selected');
-  active_item.parent().addClass('in');
-  active_item.parent().prev()
+  var active_item = $('#main-sidebar').find('.selected');
+  active_item.closest('.nav-pills').addClass('in');
+  active_item.closest('.nav-sidebar')
     .find('.icon-chevron-left')
     .removeClass('icon-chevron-left')
     .addClass('icon-chevron-down');

data/app/controllers/spree/admin/variants_controller.rb

@@ -22,31 +22,36 @@ module Spree
       end
 
       protected
-        def new_before
-          master = @object.product.master
-          @object.attributes = master.attributes.except('id', 'created_at', 'deleted_at',
-                                                                        'sku', 'is_master')
-          if master.default_price.present?
-            # Shallow Clone of the default price to populate the price field.
-            @object.default_price = master.default_price.clone
-          end
-        end
 
-        def collection
-          @deleted = (params.key?(:deleted) && params[:deleted] == "on") ? "checked" : ""
+      def new_before
+        master = @object.product.master
+        @object.attributes = master.attributes.except(
+          'id', 'created_at', 'deleted_at', 'sku', 'is_master'
+        )
+        # Shallow Clone of the default price to populate the price field.
+        @object.default_price = master.default_price.clone if master.default_price.present?
+      end
+
+      def parent
+        @product = Product.with_deleted.friendly.find(params[:product_id])
+      end
 
+      def collection
+        @deleted = (params.key?(:deleted) && params[:deleted] == "on") ? "checked" : ""
+        @collection ||=
           if @deleted.blank?
-            @collection ||= super.includes(:default_price, option_values: :option_type)
+            super.includes(:default_price, option_values: :option_type)
           else
-            @collection ||= Variant.only_deleted.where(product_id: parent.id)
+            Variant.only_deleted.where(product_id: parent.id)
           end
-          @collection
-        end
+        @collection
+      end
 
       private
-        def load_data
-          @tax_categories = TaxCategory.order(:name)
-        end
+
+      def load_data
+        @tax_categories = TaxCategory.order(:name)
+      end
     end
   end
 end

data/app/helpers/spree/admin/navigation_helper.rb

@@ -219,10 +219,12 @@ module Spree
       end
 
       def configurations_sidebar_menu_item(link_text, url, options = {})
-        is_active = url.ends_with?(controller.controller_name) ||
-                    url.ends_with?("#{controller.controller_name}/edit") ||
-                    url.ends_with?("#{controller.controller_name.singularize}/edit")
-        options.merge!(class: is_active ? 'active' : nil)
+        is_selected = url.ends_with?(controller.controller_name) ||
+                      url.ends_with?("#{controller.controller_name}/edit") ||
+                      url.ends_with?("#{controller.controller_name.singularize}/edit")
+
+        options[:class] = 'sidebar-menu-item'
+        options[:class] << ' selected' if is_selected
         content_tag(:li, options) do
           link_to(link_text, url)
         end

data/app/views/spree/admin/shared/sub_menu/_product.html.erb

@@ -1,8 +1,8 @@
 <ul id="sidebar-product" class="collapse nav nav-pills nav-stacked" data-hook="admin_product_sub_tabs">
-  <%= tab :products %>
-  <%= tab :option_types, :match_path => '/option_types' %>
+  <%= tab :products, match_path: '/products' %>
+  <%= tab :option_types, match_path: '/option_types' %>
   <%= tab :properties %>
   <%= tab :prototypes %>
-  <%= tab :taxonomies %>
-  <%= tab :taxons %>
+  <%= tab :taxonomies, match_path: '/taxonomies' %>
+  <%= tab :taxons, match_path: '/taxons' %>
 </ul>

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

@@ -20,7 +20,7 @@ describe Spree::Admin::WidgetsController, :type => :controller do
     Rails.application.reload_routes!
   end
 
-  with_model 'Widget' do
+  with_model 'Widget', scope: :all do
     table do |t|
       t.string :name
       t.integer :position
@@ -140,7 +140,9 @@ describe Spree::Admin::WidgetsController, :type => :controller do
     end
 
     it 'touches updated_at' do
-      expect { subject }.to change { widget_1.reload.updated_at }
+      Timecop.scale(3600) do
+        expect { subject }.to change { widget_1.reload.updated_at }
+      end
     end
   end
 end
@@ -171,7 +173,7 @@ describe Spree::Admin::Submodule::PostsController, type: :controller do
     Rails.application.reload_routes!
   end
 
-  with_table 'spree_posts' do |t|
+  with_table 'spree_posts', scope: :all do |t|
     t.string :name
     t.integer :position
     t.timestamps null: false

data/spec/features/admin/products/products_spec.rb

@@ -320,7 +320,9 @@ describe "Products", type: :feature do
 
       it 'should add option_types when selecting a prototype', js: true do
         visit spree.admin_product_path(product)
-        click_link 'Properties'
+        within('#sidebar') do
+          click_link 'Properties'
+        end
         click_link "Select From Prototype"
 
         within("#prototypes tr#row_#{prototype.id}") do

data/spec/features/admin/products/properties_spec.rb

@@ -34,7 +34,7 @@ describe "Properties", type: :feature, js: true do
         click_on "Filter"
         fill_in "q_name_cont", with: "size"
         click_on 'Search'
-        
+
         expect(page).to have_content("shirt size")
         expect(page).not_to have_content("shirt fit")
       end
@@ -82,7 +82,9 @@ describe "Properties", type: :feature, js: true do
       create(:product)
       visit spree.admin_products_path
       click_icon :edit
-      click_link "Properties"
+      within('#sidebar') do
+        click_link "Properties"
+      end
     end
 
     # Regression test for #2279
@@ -122,7 +124,9 @@ describe "Properties", type: :feature, js: true do
       fill_in "product_product_properties_attributes_0_property_name", with: "A Property"
       fill_in "product_product_properties_attributes_0_value", with: "A Value"
       click_button "Update"
-      click_link "Properties"
+      within('#sidebar') do
+        click_link "Properties"
+      end
     end
 
     def delete_product_property
@@ -133,7 +137,9 @@ describe "Properties", type: :feature, js: true do
     end
 
     def check_property_row_count(expected_row_count)
-      click_link "Properties"
+      within('#sidebar') do
+        click_link "Properties"
+      end
       expect(page).to have_css("tbody#product_properties")
       expect(all("tbody#product_properties tr").count).to eq(expected_row_count)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -649,7 +649,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.