solidus_backend 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad1ea97e6eba75e3721dfbcfccb3ecdab77f20c
-  data.tar.gz: ac4f60aa2bb9d1ea90931347730716133b1b2d0c
+  metadata.gz: 05228aae0a6878a6466268d87e53fe6343c97a21
+  data.tar.gz: ca8f5eda25b2bab048b41d19a8152dd7e0d33dfd
 SHA512:
-  metadata.gz: ef95b53304aeca0b04fa3ca02668f3e78b03e122c4ecfdc4d1bb35331b4f37f2eaefa285527c83410858d13adee83ab40f37abe7216e5171c6f91b9744b5256a
-  data.tar.gz: 4f09774738182a56cbd452d32698a041600d2509ff25ecf304c6b8a3d6eba19775a1fb2b8a119f80364407de3bb8ffba6f6db8822a96f2a729e18a219313b506
+  metadata.gz: 50c3569eaba93328767a52d4a21cff918fd66033b0a6ce221a6fa8d82b3398bc26ca2784b7ee059a913e3a1026ad0cba458b1c4dee53cd8531e43395d7f215e7
+  data.tar.gz: 06f5329b90aede3327936428f7da9a235ba424b0e4581b8087ad11edb72456447f39b8dfb5a45ab1bbbcc7cfdaa0f549982f0f46c4c1338aefd8c105ee29df82

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

@@ -35,6 +35,10 @@ module Spree
         @order = Order.find_by_number!(params[:order_id])
         authorize! action, @order
       end
+
+      def model_class
+        Spree::OrderCancellations
+      end
     end
   end
 end

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

@@ -159,9 +159,16 @@ module Spree
         end
 
         def set_roles
-          return unless user_params[:spree_role_ids]
-
-          @user.spree_roles = Spree::Role.where(id: user_params[:spree_role_ids])
+          # FIXME: user_params permits the roles that can be set, if spree_role_ids is set.
+          # when submitting a user with no roles, the param is not present. Because users can be updated
+          # with some users being able to set roles, and some users not being able to set roles, we have to check
+          # if the roles should be cleared, or unchanged again here. The roles form should probably hit a seperate
+          # action or controller to remedy this.
+          if user_params[:spree_role_ids]
+            @user.spree_roles = Spree::Role.where(id: user_params[:spree_role_ids])
+          elsif can?(:manage, Spree::Role)
+            @user.spree_roles = []
+          end
         end
 
         def set_stock_locations

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

@@ -54,7 +54,7 @@
       <% end %>
     <% end %>
 
-    <% if can?(:short_ship, @order) && @order.inventory_units.cancelable.present? %>
+    <% if can?(:manage, Spree::OrderCancellations) && @order.inventory_units.cancelable.present? %>
       <%= content_tag('li', :class => ('active' if current == 'Cancel Inventory'), :data => {:hook => 'admin_order_tabs_cancel_inventory'}) do %>
         <%= link_to_with_icon 'cancel', Spree.t(:cancel_inventory), admin_order_cancellations_path(@order) %>
       <% end %>

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

@@ -30,9 +30,6 @@
     <legend><%= Spree.t('access', :scope => 'api') %></legend>
 
     <% if @user.spree_api_key.present? %>
-      <div class="field">
-        <div id="current-api-key"><%= Spree.t('key', :scope => 'api') %>: <%= @user.spree_api_key %></div>
-      </div>
       <div class="filter-actions actions">
         <%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %>
           <%= button Spree.t('clear_key', :scope => 'api'), 'trash' %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-19 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.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement