spree_backend 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f934ea7b74849f1c8eeef773b4de7db93103009
-  data.tar.gz: 47e055d89c1c186254ddb60eaecbed7b422c0cbc
+  metadata.gz: 40b3e0c50a3466e2d27a556b75ddb02aa69ddb0c
+  data.tar.gz: cc2fab5e9597e131ce33008e97c28fd611d65830
 SHA512:
-  metadata.gz: 9aec6aad45c261c02bb7d2024fbc33cf824d0fc1024bfa63fe4a1d6f7e4b4a8d85bafdab323e35302f40620a6704907016dad6f6ecdcb447d758da906840dba0
-  data.tar.gz: dd42ef7b330a7bee18080f7839d88a70b311eabcc6d17465671772fc9636cb74e3abf89758a1d14641a55072b8dc27eed14123b9f791238082880e3a0f0c771f
+  metadata.gz: 7e36ce2f094093b78ad6e89f3eb08ffa2595ff8ac01d714c0f73e7d85f87368803a409aaf6cb5e651f79be681a4066f722c02fc1e33278900570dcff392f88b6
+  data.tar.gz: 257141c17829aabbcc8c15b46d3218751a3f7e4047b51ab0ff262927a461a3cf7ce7122070a629ef95983bc4f9a61f11cb5c406e9842d50ce8e8190c817d37ee

data/app/assets/javascripts/admin/image_settings.js.erb

@@ -25,10 +25,9 @@ $(document).ready(function() {
   });
 
   // Handle adding new styles
-  var styles_hash_index = 1;
   $(document).on('click', '.add_new_style', function(e) {
     e.preventDefault();
-    $('#new-styles').append(generate_html_for_hash("new_attachment_styles", styles_hash_index));
+    $('#new-styles').append(generate_html_for_hash("new_attachment_styles", new Date().getTime()));
   });
 
   // Handle adding new headers

data/app/assets/javascripts/admin/taxonomy.js.coffee

@@ -14,7 +14,7 @@ handle_move = (e, data) ->
     type: "POST",
     dataType: "json",
     url: url.toString(),
-    data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
+    data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[child_index]": position }),
     error: handle_ajax_error
 
   true
@@ -30,7 +30,7 @@ handle_create = (e, data) ->
     type: "POST",
     dataType: "json",
     url: base_url.toString(),
-    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
+    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id")}),
     error: handle_ajax_error,
     success: (data,result) ->
       node.attr('id', data.id)

data/app/assets/stylesheets/admin/hacks/_ie.scss

@@ -18,7 +18,6 @@ html.ie {
   }
   .select2-search {
     &:before {
-      position: relative;
       z-index: 10000;
       content: '\f002' !important;
     }
@@ -70,4 +69,4 @@ html.ie8 {
     }
   }
 
-}
+}

data/app/assets/stylesheets/admin/hacks/_mozilla.scss

@@ -22,6 +22,7 @@ html.firefox {
 
   // Fix select2 search input left padding to not overlap search icon
   .select2-search input.select2-input {
+    padding-bottom: 12px !important;
     padding-left: 25px !important;
   }
 
@@ -29,4 +30,4 @@ html.firefox {
   input#image_attachment {
     width: 80%;
   }
-}
+}

data/app/assets/stylesheets/admin/plugins/_select2.scss

@@ -63,7 +63,7 @@
     @extend [class^="icon-"]:before;
 
     position: absolute;
-    top: 13px;
+    top: 16px;
     left: 13px;
   }
 

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

@@ -39,39 +39,22 @@ module Spree
         parent_id = params[:taxon][:parent_id]
         new_position = params[:taxon][:position]
 
-        if parent_id || new_position #taxon is being moved
-          new_parent = parent_id.nil? ? @taxon.parent : Taxon.find(parent_id.to_i)
-          new_position = new_position.nil? ? -1 : new_position.to_i
+        if parent_id
+          @taxon.parent = Taxon.find(parent_id.to_i)
+        end
 
-          # Bellow is a very complicated way of finding where in nested set we
-          # should actually move the taxon to achieve sane results,
-          # JS is giving us the desired position, which was awesome for previous setup,
-          # but now it's quite complicated to find where we should put it as we have
-          # to differenciate between moving to the same branch, up down and into
-          # first position.
-          new_siblings = new_parent.children
-          if new_position <= 0 && new_siblings.empty?
-            @taxon.move_to_child_of(new_parent)
-          elsif new_parent.id != @taxon.parent_id
-            if new_position == 0
-              @taxon.move_to_left_of(new_siblings.first)
-            else
-              @taxon.move_to_right_of(new_siblings[new_position-1])
-            end
-          elsif new_position < new_siblings.index(@taxon)
-            @taxon.move_to_left_of(new_siblings[new_position]) # we move up
-          else
-            @taxon.move_to_right_of(new_siblings[new_position-1]) # we move down
-          end
-          # Reset legacy position, if any extensions still rely on it
-          new_parent.children.reload.each{|t| t.update_column(:position, t.position)}
+        if new_position
+          @taxon.child_index = new_position.to_i
+        end
 
-          if parent_id
-            @taxon.reload
-            @taxon.set_permalink
-            @taxon.save!
-            @update_children = true
-          end
+        @taxon.save!
+
+        # regenerate permalink
+        if parent_id
+          @taxon.reload
+          @taxon.set_permalink
+          @taxon.save!
+          @update_children = true
         end
 
         if params.key? "permalink_part"

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

@@ -2,7 +2,7 @@
 
 <% content_for :page_title do %>
   <i class="icon-arrow-right"></i>
-  <%= I18n.t("activerecord.models.#{@payment.class.to_s.underscore}.one") %>
+  <%= I18n.t(:one, scope: "activerecord.models.spree/payment") %>
   <i class="icon-arrow-right"></i>
   <%= payment_method_name(@payment) %>
 <% end %>

data/app/views/spree/admin/shared/_report_criteria.html.erb

@@ -1,13 +1,13 @@
 <%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
     <div class="date-range-filter field align-center">
         <%= label_tag nil, Spree.t(:start), :class => 'inline' %>
-        <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from' %>
+        <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:created_at_gt]) %>
         
         <span class="range-divider">
           <i class="icon-arrow-right"></i>
         </span>
 
-        <%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to' %>
+        <%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:created_at_lt]) %>
         <%= label_tag nil, Spree.t(:end), :class => 'inline' %>
     </div>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -80,34 +80,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.7
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.8
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement