adeia 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 605ce68d14c5ef2253c3781728549c7d2a1f3f96
-  data.tar.gz: 5676dd30928133149c7065863b8efde3d74670de
+  metadata.gz: 4b08277fdb322062a8103b23b881081812ee24c9
+  data.tar.gz: 712d833cba713600dcc68bf2138f39f93b5c6278
 SHA512:
-  metadata.gz: e71c77a3fa2bf4451eb47cccc57dba45b76e3d980b8f5e40d353439c8679c468148508cc18777b26ee85677393e96d3e0d67b6f32e571982b060b4a6a7d6ee9d
-  data.tar.gz: 46155469ad139615faac10e783d627e14166989d709e8dfda97b3184469a838a69fce00c65cad3028cc754eb4efab4f16214a84beca3b681e76925b771a7b0d3
+  metadata.gz: 6563fa5410b78d7fff5d42c16938f3ae4b32f74cc1a5233e1fc9f568e0f769244de88c1f0a73133d5d083a30a088415fede04c1ddb67045a467ca744a94a0f07
+  data.tar.gz: 86a5f3306dd1eff5650f7cf4f43d932b45f0a3d4fce089b49d35ba3d421305e8a326fd44ac34c1c7d34e7dde54052ecac989e360908470b2edaf1e18dae36e72

data/app/assets/javascripts/adeia/flash.js

@@ -1,5 +1,5 @@
-$(document).on("ready page:load", function() {
+$(document).on("ready", function() {
   $('body').on("click", "#flash .close", function() {
     $('#flash').hide();
   });
-});
+});

data/app/assets/javascripts/adeia/nested_form.js

@@ -1,4 +1,4 @@
-$(document).on("ready page:load", function() {
+$(document).on("ready", function() {
 
   $(".add-fields").click(function(e) {
     e.preventDefault();
@@ -6,8 +6,8 @@ $(document).on("ready page:load", function() {
         lastFields = $("." + type + "-fields:last"), newFields = lastFields.clone();
     count++;
     newFields.find("input, select")
-      .attr("name", function( i, val ) { if(val) { return val.replace(/\d/, count) } })
-      .attr("id", function( i, val ) { if(val) { return val.replace(/\d/, count) } })
+      .attr("name", function(i, val) { if(val) { return val.replace(/\d/, count) } })
+      .attr("id", function(i, val) { if(val) { return val.replace(/\d/, count) } })
       .val([]);
     newFields.find("label").attr("for", function( i, val ) { return val.replace(/\d/, count) });
     newFields.insertAfter(lastFields);
@@ -23,4 +23,4 @@ $(document).on("ready page:load", function() {
     fields.hide();
   });
 
-});
+});

data/app/controllers/adeia/permissions_controller.rb

@@ -41,7 +41,7 @@ module Adeia
     private
 
     def permission_params
-      params.require(:permission).permit(:permission_type, :adeia_element_id, :global_owner, :read_right, :create_right, :update_right, :destroy_right, :resource_id, actions_attributes: [:name])
+      params.require(:permission).permit(:permission_type, :adeia_element_id, :global_owner, :read_right, :create_right, :update_right, :destroy_right, :resource_id, actions_attributes: [:id, :name, :_destroy])
     end
 
   end

data/app/models/adeia/permission.rb

@@ -24,7 +24,7 @@ class Adeia::Permission < ActiveRecord::Base
   end
 
   def autosave_associated_records_for_actions
-    self.actions = actions.reject{ |a| a._destroy == true }.map do |action|
+    self.actions = actions.reject{ |a| a.marked_for_destruction? }.map do |action|
       Adeia::Action.find_or_create_by(name: action.name)
     end
   end

data/app/views/adeia/permissions/_form.html.erb

@@ -4,7 +4,7 @@
 
   <%= f.label :permission_type %>
   <%= f.select :permission_type, options_for_enum(@permission, :permission_type) %>
-  
+
   <%= f.label :adeia_element_id %>
   <%= f.collection_select :adeia_element_id, Adeia::Element.all, :id, :name %>
 
@@ -32,6 +32,8 @@
         <%= action_f.label :name %>
         <%= action_f.text_field :name %>
 
+        <%= action_f.hidden_field :_destroy, identifier: "destroy" %>
+
         <button class="remove-fields" data-type="actions"><%= t "adeia.permissions.form.actions.destroy" %></button>
       </div>
 
@@ -44,4 +46,4 @@
 
   <%= f.submit %>
 
-<% end %>
+<% end %>

data/lib/adeia/version.rb

@@ -1,3 +1,3 @@
 module Adeia
-  VERSION = "0.15.1"
+  VERSION = "0.15.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adeia
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - khcr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-06 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails