solidus_backend 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87c62b3326ebc0d631669e3dc6d60879fe2a11b3
-  data.tar.gz: 246d61ab89e432641d5616cfe179f2eddc866707
+  metadata.gz: 06989a896502698f667c9003187bae8aaaa01d44
+  data.tar.gz: f1804fb9406cc68260ab5630bec3bac3217cbe79
 SHA512:
-  metadata.gz: 11ab1253fe0a288fe11bd7f308e209fb303496e005b49d60427e07e78ed8eca9d974a60a2c7294504d7f6ef254a583fbe2319daaaffcd3284b8d5dde844371be
-  data.tar.gz: 4af71715d6cea8635f07f798c005fce1fffa8d296742567cf48665423271c70147d312a1d81a490f41384e78bbac49d98d66b3e60ffa36abb87e3e98ad88636f
+  metadata.gz: 4df80190b2cab7f56d803c754e55901f88dc314024e9256b5113f0641e2df1a700b5bcbe345b2a0c10b70485229d976f47958a5b13fe569af6b17bb92de2e22c
+  data.tar.gz: 83fefa9cbf10943d2a68b2f0872f5515c7d175023ebaeaecad97092553ac442ce49f478d492783ab1e6fb23cfafdf797b024ac4471221707f22d754207c4167b

data/app/assets/javascripts/spree/backend/handlebars_extensions.coffee

@@ -7,3 +7,5 @@ Handlebars.registerHelper "t", (key)->
     console.error "No translation found for #{key}."
     key
 
+Handlebars.registerHelper "admin_url", ->
+  Spree.pathFor("admin")

data/app/assets/javascripts/spree/backend/taxonomy.js.coffee

@@ -1,4 +1,3 @@
-taxons_template = null
 Handlebars.registerHelper 'isRootTaxon', ->
   !@parent_id?
 
@@ -32,6 +31,7 @@ delete_taxon = ({id}) ->
     error: redraw_tree
 
 draw_tree = (taxonomy) ->
+  taxons_template = HandlebarsTemplates["taxons/tree"]
   $('#taxonomy_tree')
     .html( taxons_template({ taxons: [taxonomy.root] }) )
     .find('ul')
@@ -67,21 +67,25 @@ handle_delete = (e) ->
     delete_taxon({id: el.data('taxon-id')})
     el.remove()
 
+handle_add_child = (e) ->
+  el = $(e.target).closest('li')
+  parent_id = el.data('taxon-id')
+  name = 'New node'
+  child_index = 0
+  create_taxon({name, parent_id, child_index})
+
 get_create_handler = (taxonomy_id) ->
   handle_create = (e) ->
     e.preventDefault()
-    name = 'New node'
-    parent_id = taxonomy_id
-    child_index = 0
-    create_taxon({name, parent_id, child_index})
+    get_taxonomy().done (taxonomy) ->
+      name = 'New node'
+      parent_id = taxonomy.root.id
+      child_index = 0
+      create_taxon({name, parent_id, child_index})
 
-@setup_taxonomy_tree = (taxonomy_id) ->
-  return unless taxonomy_id?
-  taxons_template_text = $('#taxons-list-template').text()
-  taxons_template = Handlebars.compile(taxons_template_text)
-  Handlebars.registerPartial( 'taxons', taxons_template_text )
+setup_taxonomy_tree = (taxonomy_id) ->
   redraw_tree()
-  $('#taxonomy_tree').on
+  $("#taxonomy_tree").on
       sortstart: (e, ui) ->
         resize_placeholder(ui)
       sortover: (e, ui) ->
@@ -89,5 +93,10 @@ get_create_handler = (taxonomy_id) ->
       sortstop: restore_sort_targets
       sortupdate: (e, ui) ->
         handle_move(ui.item) unless ui.sender?
-    .on('click', '.delete-taxon-button', handle_delete)
+    .on('click', '.js-taxon-delete', handle_delete)
+    .on('click', '.js-taxon-add-child', handle_add_child)
   $('.add-taxon-button').on('click', get_create_handler(taxonomy_id))
+
+$ ->
+  if $('#taxonomy_tree').length
+    setup_taxonomy_tree($('#taxonomy_tree').data("taxonomy-id"))

data/app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs

@@ -0,0 +1,16 @@
+{{#each taxons}}
+  <li data-taxon-id="{{id}}" data-taxon-taxonomy-id="{{taxonomy_id}}">
+    <div  class="sortable-handle">
+      {{#if (isRootTaxon) }}{{else}}<i class="fa fa-arrows"></i>{{/if}}
+      {{name}}
+      <div class="actions right">
+        <a href="#" class="js-taxon-add-child fa fa-plus icon_link no-text"></a>
+        <a href="{{admin_url}}/taxonomies/{{taxonomy_id}}/taxons/{{id}}/edit" class="fa fa-edit icon_link no-text"></a>
+        <a href="#" class="js-taxon-delete fa fa-trash icon_link no-text"></a>
+      </div>
+    </div>
+    <ul>
+      {{> taxons/_tree }}
+    </ul>
+  </li>
+{{/each}}

data/app/assets/javascripts/spree/backend/templates/taxons/tree.hbs

@@ -0,0 +1 @@
+{{> taxons/_tree }}

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

@@ -1,8 +1,5 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
-<%= render :partial => 'spree/admin/taxons/list_template' %>
-<%= render :partial => 'js_head' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:taxonomy_edit) %>
 <% end %>
@@ -33,6 +30,6 @@
       Spree.routes.taxonomy_taxons_path = "<%= spree.api_taxonomy_taxons_path(@taxonomy) %>";
       Spree.routes.admin_taxonomy_taxons_path = "<%= spree.admin_taxonomy_taxons_path(@taxonomy) %>";
     </script>
-    <div id="taxonomy_tree" class="tree"></div>
+    <div id="taxonomy_tree" class="tree" data-taxonomy-id="<%= @taxonomy.id %>"></div>
   </div>
 <% end %>

data/spec/features/admin/taxons_spec.rb

@@ -22,10 +22,21 @@ describe "Taxonomies and taxons", :type => :feature do
     expect(page).to have_content("Taxon \"Shirt\" has been successfully updated!")
   end
 
-  it "can see taxon tree", js: true do
+  it "can view and add to taxon tree", js: true do
     taxonomy = create :taxonomy
 
     visit spree.edit_admin_taxonomy_path(taxonomy)
     expect(page).to have_content('Brand')
+
+    click_on('Add taxon')
+    expect(page).to have_content('New node')
+
+    # Little tricky to select the right taxon. Since the text is technically
+    # inside the top-level li.
+    within '#taxonomy_tree li li', text: 'New node' do
+      click_icon :edit
+    end
+
+    expect(page).to have_current_path %r{/admin/taxonomies/\d+/taxons/\d+/edit}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +185,8 @@ files:
 - app/assets/javascripts/spree/backend/templates/promotions/rules/option_values_select.hbs
 - app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs
 - app/assets/javascripts/spree/backend/templates/stock_transfers/transfer_item.hbs.erb
+- app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs
+- app/assets/javascripts/spree/backend/templates/taxons/tree.hbs
 - app/assets/javascripts/spree/backend/templates/variants/autocomplete.hbs.erb
 - app/assets/javascripts/spree/backend/templates/variants/autocomplete_stock.hbs
 - app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs
@@ -571,14 +573,12 @@ files:
 - app/views/spree/admin/tax_rates/index.html.erb
 - app/views/spree/admin/tax_rates/new.html.erb
 - app/views/spree/admin/taxonomies/_form.html.erb
-- app/views/spree/admin/taxonomies/_js_head.html.erb
 - app/views/spree/admin/taxonomies/_list.html.erb
 - app/views/spree/admin/taxonomies/_taxon.html.erb
 - app/views/spree/admin/taxonomies/edit.erb
 - app/views/spree/admin/taxonomies/index.html.erb
 - app/views/spree/admin/taxonomies/new.html.erb
 - app/views/spree/admin/taxons/_form.html.erb
-- app/views/spree/admin/taxons/_list_template.html.erb
 - app/views/spree/admin/taxons/_taxon_table.html.erb
 - app/views/spree/admin/taxons/edit.html.erb
 - app/views/spree/admin/taxons/index.html.erb

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

@@ -1,13 +0,0 @@
-<% content_for :head do %>
-  <%= javascript_tag "var taxonomy_id = #{@taxonomy.id};
-    var loading = '#{escape_javascript Spree.t(:loading)}';
-    var new_taxon = '#{escape_javascript Spree.t(:new_taxon)}';
-    var server_error = '#{escape_javascript Spree.t(:server_error)}';
-    var taxonomy_tree_error = '#{escape_javascript Spree.t(:taxonomy_tree_error)}';
-
-    $(document).ready(function(){
-      setup_taxonomy_tree(taxonomy_id);
-    });
-    "
-  %>
-<% end %>

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

@@ -1,17 +0,0 @@
-<script type="text/template" id="taxons-list-template">
-  {{#each taxons}}
-  <li data-taxon-id="{{id}}" data-taxon-taxonomy-id="{{taxonomy_id}}">
-    <div  class="sortable-handle">
-      {{#if (isRootTaxon) }}{{else}}<i class="fa fa-arrows"></i>{{/if}}
-      {{name}}
-      <div class="actions right">
-        <a href="/admin/taxonomies/{{taxonomy_id}}/taxons/{{id}}/edit" class="fa fa-edit icon_link with-tip no-text"></a>
-        <a href="#" class="delete-taxon-button fa fa-trash icon_link with-tip no-text"></a>
-      </div>
-    </div>
-    <ul>
-      {{> taxons}}
-    </ul>
-  </li>
-  {{/each}}
-</script>