egov_utils 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eae0f0f3e3b9e24657d648a0ae710b0ea209b41385303a0dfe98996475f319b2
-  data.tar.gz: 5cf138da356f3ac4068f58a0e18d9fb7a1e51474fa7669c7c07a8e788c7a951b
+  metadata.gz: f91e4fd34931a6237076b8c8e859cb184c5d61f1ae1c2310800d795d03eee04a
+  data.tar.gz: da90da14b07d985a456c5742fc17ef50cafb40718ad91e6bc69b23bc55a65f26
 SHA512:
-  metadata.gz: f657dbbc3c0b06c7a832874d524aaf3bc9c42584c97d1d721c3fe229dd2ecf05a4d0f79ae9157dc35cf5c129d5358c79b9ccaea67d49405cfc6ded7c910deb5d
-  data.tar.gz: d7f627e6fa125e04d8520bb6a4fd21c76c1c35415f2756fa9b07a370dfa7fba6ea98ad92041e6f0bd43f64680d13d0d2dcc5be4b5674ea7023c6192d1a9cded0
+  metadata.gz: defc11887b3528370c76e42de8a7c6b93cb48ca7067675f68378a9e8ee4ef0832d83328e606d925a70b222fa2b2e4801ad1e81757015b32082e8cfb40f6c1df2
+  data.tar.gz: 923f682a552728d002baef7a27101d976c209318fd920104994db7acc624ff4595d1666971af5dc3132d7d4f05cc57f2bfa2a3fa7ad01079b0d87c55132f5d89

data/app/assets/javascripts/egov_utils/eGovUtilities.coffee.erb

@@ -1,4 +1,12 @@
 
+window.set_disabled_observer = (element, trigger) ->
+  observer = new MutationObserver (mutations) ->
+    mutations.forEach (mutation)->
+      if mutation.attributeName == "disabled"
+        trigger();
+  observer.observe(element, {attributes: true})
+  observer
+
 window.eGovUtilities =
   setup: ()->
     # select2 defaults
@@ -56,16 +64,20 @@ window.eGovUtilities =
 
   initPeople: ($container)->
     $container ||= $(document)
-    $('.person-form .person-type-toggle', $container).on('change', (evt)->
+    $type_toggles = $('.person-form .person-type-toggle', $container)
+    $type_toggles.on('change', (evt)->
       val = $(this).val();
       $form = $(this).closest('.person-form');
       $form.find('.natural_person').toggle( val == 'natural').find(':input').prop('disabled', val != 'natural');
       $form.find('.legal_person').toggle( val == 'legal').find(':input').prop('disabled', val != 'legal');
-    ).change()
+    )
+    $type_toggles.each (index)->
+      $el = $(this)
+      $el.change() if $el.is(':visible')
 
   initSelect2: ($container)->
     $container ||= $(document)
-    $('[data-provide="select2"]', $container).select2()
+    $('[data-provide="select2"]', $container).select2(width: null)
 
   destroySelect2: ($container)->
     $container ||= $(document)
@@ -85,6 +97,27 @@ window.eGovUtilities =
     # )
     $cpyBtn
 
+  toggleContainerForm: ($container, toggle_state) ->
+    $container.toggle(toggle_state)
+    $container.find(':input').prop('disabled', !toggle_state)
+
+  toggableForm: ($toggler, attr_names, get_state) ->
+    get_state ||= ($toggler)->
+      input_type = $toggler.attr('type')
+      state = !$toggler.prop('disabled')
+      if input_type == 'checkbox'
+        state = state && $toggler.is(':checked')
+      else
+        state = state && !$toggler.val() && $toggler.val() != ''
+      return state
+
+    $attributes = $toggler.closest('.'+attr_names).find('.'+attr_names+'-attributes')
+
+    eGovUtilities.toggleContainerForm($attributes, get_state($toggler))
+    $toggler.on 'change', (evt) ->
+      eGovUtilities.toggleContainerForm($attributes, get_state($toggler))
+
+
   initModal: (modalId, options)->
     options = options || {}
     modalId = modalId || 'modal'

data/app/models/egov_utils/group.rb

@@ -16,16 +16,20 @@ module EgovUtils
     end
 
     def members
-
+      if ldap?
+        EgovUtils::User.where(login: ldap_members.collect{|m| m[:login] })
+      else
+        users
+      end
     end
 
     def ldap_members
-      Rails.cache.fetch("#{cache_key}/ldap_members", expires_in: 2.hours) do
-        if provider.present?
+      if provider.present?
+        Rails.cache.fetch("#{cache_key}/ldap_members", expires_in: 2.hours) do
           auth_source.group_members(ldap_uid)
-        else
-          []
         end
+      else
+        []
       end
     end
 

data/app/schemas/egov_utils/user_schema.rb

@@ -7,7 +7,7 @@ module EgovUtils
 
     def initialize_available_attributes
       @available_attributes ||= []
-      @available_attributes << AzaharaSchema::DerivedAttribute.new(model, 'fullname', :concat, 'firstname', 'lastname', schema: self)
+      @available_attributes << AzaharaSchema::DerivedAttribute.new(model, 'fullname', :concat, 'lastname', 'firstname', schema: self)
       super
       @available_attributes << AllRoleNames.new(model, 'all_role_names', 'string')
     end

data/app/views/egov_utils/addresses/_form.html.haml

@@ -41,7 +41,9 @@
         }
       })
       window.setTimeout(function(){
-        $('.country-select', $fields).change();
+        var $country_select = $('.country-select', $fields);
+        if( $country_select.is(':visible') )
+          $country_select.change();
       }, 1500);
 
       $('.address-validator-btn', $fields).on('click', function(evt) {

data/app/views/egov_utils/people/_form.html.haml

@@ -5,7 +5,7 @@
     = form.fields_for(:natural_person, person.natural_person || EgovUtils::NaturalPerson.new) do |fields|
       .col-12.col-sm-6= fields.text_field(:firstname)
       .col-12.col-sm-6= fields.text_field(:lastname)
-      .col-12.col-sm-6= fields.date_field(:birth_date, data: {'date-view-mode' => 'decades', 'date-min-date' => Date.new(1920, 1, 1).to_s, 'date-max-date' => Date.today.to_s, 'date-use-current' => false, 'date-view-date' => Date.new(1950, 1, 1).to_s })
+      .col-12.col-sm-6= fields.date_field(:birth_date, min: Date.new(1920, 1, 1), max: Date.today, data: {'date-view-mode' => 'decades', 'date-use-current' => false, 'date-view-date' => Date.new(1950, 1, 1).to_s })
       .col-12.col-sm-6= fields.text_field(:birth_place)
   .legal_person.row
     = form.fields_for(:legal_person, person.legal_person || EgovUtils::LegalPerson.new) do |fields|

data/lib/egov_utils/model_permissions.rb

@@ -1,7 +1,7 @@
 module EgovUtils
   class ModelPermissions
 
-    def self.build(model, user)
+    def self.build(model, ability)
       klass = model
       klasses = [klass]
       while klass != klass.base_class
@@ -10,15 +10,15 @@ module EgovUtils
       end
       klasses.each do |kls|
         perm_class = "#{kls.name}Permissions".safe_constantize
-        return perm_class.new(user) if perm_class
+        return perm_class.new(ability) if perm_class
       end
-      EgovUtils::ModelPermissions.new(model, user)
+      EgovUtils::ModelPermissions.new(model, ability)
     end
 
-    attr_reader :model, :user
+    attr_reader :model, :ability
 
-    def initialize(model, user)
-      @model, @user = model, user
+    def initialize(model, ability)
+      @model, @ability = model, ability
     end
 
     def readable_attributes(action=:show)
@@ -33,20 +33,55 @@ module EgovUtils
       basic_editable_attributes(action)
     end
 
+    def assignable_associations
+      model.reflect_on_all_associations.select{|assoc| model.method_defined?("#{assoc.name}_attributes=".to_sym) }
+    end
+
     def editable_attributes(action=:update)
+      return [] unless ability.can?(action, model)
       attributes = basic_editable_attributes(action)
-      assocs = model.reflect_on_all_associations.select{|assoc| model.method_defined?("#{assoc.name}_attributes=".to_sym) }
-      attributes << assocs.each_with_object({}) {|assoc, obj| obj["#{assoc.name}_attributes"] = self.class.build(assoc.klass, user).editable_attributes(action) }
+      assignable_associations.each{|assoc| add_editable_association_attributes(attributes, assoc, action) }
       attributes
     end
 
     #TODO nested attributes should take entity as well - what to do with has_many?
     def editable_attributes_for(entity, action=:update)
+      return [] unless ability.can?(action, entity)
       attributes = basic_editable_attributes(action)
-      assocs = model.reflect_on_all_associations.select{|assoc| model.method_defined?("#{assoc.name}_attributes=".to_sym) }
-      attributes << assocs.each_with_object({}) {|assoc, obj| obj["#{assoc.name}_attributes"] = self.class.build(assoc.klass, user).editable_attributes_for(action) }
+      assignable_associations.each{|assoc| add_editable_association_attributes_for(attributes, assoc, entity, action) }
       attributes
     end
 
+    def add_editable_association_attributes(attributes, assoc, action)
+      assoc_permissions = self.class.build(assoc.klass, ability)
+
+      assoc_attributes  = assoc_permissions.editable_attributes(action)
+      assoc_attributes.unshift('id') if ability.can?(:update, assoc.klass)
+      assoc_attributes_hash = { "#{assoc.name}_attributes" => assoc_attributes }
+
+      case assoc.macro
+      when :has_many
+        attributes << assoc_attributes_hash
+      when :has_one, :belongs_to
+        if ability.can?(:update, assoc.klass)
+          attributes << assoc.foreign_key if assoc.macro == :belongs_to
+          attributes << assoc_attributes_hash
+        else
+          attributes << assoc_attributes_hash
+        end
+      else
+        attributes << assoc_attributes_hash
+      end
+    end
+
+    def add_editable_association_attributes_for(attributes, assoc, entity, action)
+      case assoc.macro
+      when :has_many
+
+      else
+        add_editable_association_attributes(attributes, assoc, action)
+      end
+    end
+
   end
 end

data/lib/egov_utils/user_utils/application_controller_patch.rb

@@ -60,11 +60,11 @@ module EgovUtils
       end
 
       def editable_attributes(model, action=:update)
-        EgovUtils::ModelPermissions.build(model, current_user).editable_attributes(action)
+        EgovUtils::ModelPermissions.build(model, current_ability).editable_attributes(action)
       end
 
       def editable_attributes_for(entity, action=:update)
-        EgovUtils::ModelPermissions.build(entity.type, current_user).editable_attributes_for(entity, action)
+        EgovUtils::ModelPermissions.build(entity.type, current_ability).editable_attributes_for(entity, action)
       end
 
       protected

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails