egov_utils 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98563db37b266366066d36a56ebb7ed53534541e7336222bf661e6ddbc16e4d1
-  data.tar.gz: df82245adc227118e0a5121533577892a0f600d2e8686326d99977898fbf4745
+  metadata.gz: 95806a00ea00056d9b5fde6021f6c21396b32e2df79cd83013c5037d6b70e8bd
+  data.tar.gz: f4b1b82603961bfa405a571a3334f9d314e6ae7d1a4129207c20a7443ea5be18
 SHA512:
-  metadata.gz: 3f04dbb11e0fd2f5d60549866692fccea5d2e4f1e5fdaff2866df22dc6ae9bd80104ad85ccda527b266a3865928ddc06155f9b9599d5f8536b062e48863babb1
-  data.tar.gz: d5b00342147737881c3710fe8f22e6456c5c31a419c34a765531e18d326579ee4f2990e0d0c477b8e328e4591e8d8e7bb30af066667513aa6015abbcd7f9b75b
+  metadata.gz: 1940243795ec41628b229e5c8c11d4cf72c9756a64b392bffda8ca592fb352acf5c9b0f827f8984b15e249908a2d8ec101b1626f00c2f2b55b2c61a9c044937f
+  data.tar.gz: bfa492468b390a86787ea875592fa4b2708044f5d24060621df3547262926d6136d351ce9dc92cfa0bcef5cb3c410e60dc1c8f2b5efc8dc15bdb9678bdf12487

data/app/assets/stylesheets/egov_utils/egov_utils.scss

@@ -5,6 +5,8 @@
 @import 'select2/select2';
 @import 'egov_utils/select2-bootstrap';
 
+@import 'shield-custom/all';
+
 @import "cookies_eu";
 
 .button_to {

data/app/attributes/egov_utils/full_address.rb

@@ -2,7 +2,7 @@ module EgovUtils
   class FullAddress < AzaharaSchema::DerivedAttribute
 
     def initialize(model, name, **options)
-      super(model, name, :concat, 'city', 'street', options)
+      super(model, name, :concat, 'postcode', 'city', 'street', 'number', options)
     end
 
     def build_json_options!(options)

data/app/controllers/egov_utils/groups_controller.rb

@@ -33,6 +33,7 @@ module EgovUtils
     end
 
     def add_users
+      render_404 and return if @group.allow_member_assign?
       @users = User.not_in_group(@group).where(:id => (params[:user_id] || params[:user_ids])).to_a
       @group.users << @users
       respond_to do |format|

data/app/models/egov_utils/group.rb

@@ -26,7 +26,7 @@ module EgovUtils
     def ldap_members
       if provider.present?
         Rails.cache.fetch("#{cache_key}/ldap_members", expires_in: 2.hours) do
-          auth_source.group_members(ldap_uid)
+          auth_source.group_members(ldap_dn)
         end
       else
         []

data/app/views/egov_utils/groups/show.html.haml

@@ -1,8 +1,9 @@
 %h2= @group.name
 
-= link_to(new_users_group_path(@group), remote: true) do
-  %i.fa.fa-plus-circle{'aria-hidden' => 'true'}
-  = t('label_add_group_member')
+- if @group.allow_member_assign? && can?(:manage, @group)
+  = link_to(new_users_group_path(@group), remote: true) do
+    %i.fa.fa-plus-circle{'aria-hidden' => 'true'}
+    = t('label_add_group_member')
 %ul
   - @group.users.each do |user|
     %li= user.fullname

data/lib/azahara_schema_currency.rb

@@ -8,3 +8,5 @@ AzaharaSchema::AttributeFormatter.__send__('prepend', AzaharaSchemaCurrency::Att
 
 require 'azahara_schema_currency/association_attribute_patch'
 AzaharaSchema::AssociationAttribute.__send__('prepend', AzaharaSchemaCurrency::AssociationAttributePatch)
+require 'azahara_schema_currency/aggregation_attribute_patch'
+AzaharaSchema::AggregationAttribute.__send__('prepend', AzaharaSchemaCurrency::AggregationAttributePatch)

data/lib/azahara_schema_currency/aggregation_attribute_patch.rb

@@ -0,0 +1,9 @@
+module AzaharaSchemaCurrency
+  module AggregationAttributePatch
+
+    def currency_code(entity)
+      'czk'
+    end
+
+  end
+end

data/lib/azahara_schema_currency/attribute_formatter_patch.rb

@@ -4,7 +4,7 @@ module AzaharaSchemaCurrency
     def format_value_html(attribute, unformated_value, **options)
       case attribute.type
       when 'currency'
-        Money.new(unformated_value, options[:currency_code].to_s.upercase.presence).format
+        Money.from_amount(unformated_value, options[:currency_code].to_s.upcase.presence).format
       else
         super
       end

data/lib/azahara_schema_currency/currency_attribute.rb

@@ -18,5 +18,11 @@ module AzaharaSchemaCurrency
       entity.try(currency_code_col)
     end
 
+    def value(record)
+      val = super(record)
+      val = BigDecimal.new( val.to_s ) unless val.is_a?(BigDecimal)
+      val
+    end
+
   end
 end

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -538,6 +538,7 @@ files:
 - db/migrate/20180403150556_create_egov_utils_legal_people.rb
 - db/migrate/20180424143207_add_titles_to_natural_people.rb
 - lib/azahara_schema_currency.rb
+- lib/azahara_schema_currency/aggregation_attribute_patch.rb
 - lib/azahara_schema_currency/association_attribute_patch.rb
 - lib/azahara_schema_currency/attribute_formatter_patch.rb
 - lib/azahara_schema_currency/currency_attribute.rb