egov_utils 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91e4fd34931a6237076b8c8e859cb184c5d61f1ae1c2310800d795d03eee04a
-  data.tar.gz: da90da14b07d985a456c5742fc17ef50cafb40718ad91e6bc69b23bc55a65f26
+  metadata.gz: a0e499d916b193c97d48999f4862bddf853c70c7e2458f718641ecbec895cded
+  data.tar.gz: a502e385e0afb8be990fdc438cd94433afc6984853b1aec8fa1dfbefa0d398dc
 SHA512:
-  metadata.gz: defc11887b3528370c76e42de8a7c6b93cb48ca7067675f68378a9e8ee4ef0832d83328e606d925a70b222fa2b2e4801ad1e81757015b32082e8cfb40f6c1df2
-  data.tar.gz: 923f682a552728d002baef7a27101d976c209318fd920104994db7acc624ff4595d1666971af5dc3132d7d4f05cc57f2bfa2a3fa7ad01079b0d87c55132f5d89
+  metadata.gz: 002bd6cc5358ac39753abb16e3e276e0a965addbab6b3c191dd53579d8eb94ffa2badf155d20f4690e114f33c5059360c6f697e53fc13fe959690337198869f4
+  data.tar.gz: 6b77faa9d8755c12e75ae565242eb65bc20c29448ee90eaa1c01ea5bef3bee9d41a90b8e425d66d6ea24bd24ab31c8e3337a632df1f8d432344de2e365edefb7

data/app/models/egov_utils/principal.rb

@@ -37,14 +37,24 @@ module EgovUtils
       organization_by_domain.try(:key)
     end
 
-    def organization_id(organization_key=self.organization_key)
+    def organization_id
+      organization_by_domain.try(:id)
+    end
+
+    def organization_id_by_key(organization_key=self.organization_key)
       EgovUtils::Organization.find_by_key(organization_key).try(:id)
     end
 
     def organization_with_suborganizations_keys(organization_key=self.organization_key)
       return [] unless organization_key
       Rails.cache.fetch("organizations/#{organization_key}/org_with_suborgs_keys") do
-        [organization_key] + ( organization_key && EgovUtils::Organization.where(superior_id: organization_id(organization_key)).collect(&:key) || [] )
+        [organization_key] + ( organization_key && EgovUtils::Organization.where(superior_id: organization_id_by_key(organization_key)).collect(&:key) || [] )
+      end
+    end
+
+    def organization_with_suborganizations_ids(organization_id=self.organization_id)
+      Rails.cache.fetch("organizations/#{organization_key}/org_with_suborgs_ids") do
+        [organization_id] + ( organization_id && EgovUtils::Organization.where(superior_id: organization_id).collect(&:id) || [] )
       end
     end
   end

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

@@ -17,9 +17,9 @@
   .col-12
     - form.object.country ||= EgovUtils::Address::CZ_ISO_CODE
     = form.select2 :country, EgovUtils::Address.countries.collect{|c| [c[:name],c[:iso_id]]}, {}, class: 'country-select'
-  .col-12
-    %div.validation-button
-      = link_to t('label_validate_address'), 'javascript:void(0)', class: 'btn btn-secondary address-validator-btn'
+  /.col-12
+  /  %div.validation-button
+  /    = link_to t('label_validate_address'), 'javascript:void(0)', class: 'btn btn-secondary address-validator-btn'
 
 :javascript
   $(function(){

data/config/locales/cs.yml

@@ -44,18 +44,19 @@ cs:
 
   label_approve: Schválit
   label_new: Nový
+  label_create: Vytvořit
   label_edit: Upravit
+  label_save: Uložit
+  label_delete: Smazat
+  label_ok: OK
   label_profile: Profil
   label_change_password: Změnit heslo
   label_login: Přihlásit
   label_logout: Odhlásit
   label_signup: Registrovat
   label_validate_address: Zvalidovat
-  label_save: Uložit
   label_ldap: LDAP
   label_search: Vyhledat
-  label_delete: Smazat
-  label_ok: OK
   label_actions: Akce
   label_done: hotovo
   label_add_group_member: Přidat uživatele

data/lib/bootstrap_form/datetimepicker.rb

@@ -20,7 +20,7 @@ module BootstrapForm
     def datetime_local_field(name, *args)
       options = args.extract_options!.symbolize_keys!
       options[:datetimepicker] = true
-      options[:data] = {'date-extra-formats' => [BootstrapForm::DATE_FORMAT_JS+"THH:mm:ss"]}.merge(options[:data] || {})
+      options[:data] = {'date-extra-formats' => [BootstrapForm::DATE_FORMAT_JS+"THH:mm"+(options[:include_seconds] ? ':ss' : '')]}.merge(options[:data] || {})
       options[:append] = calendar_addon
       args << options
       super

data/lib/egov_utils/engine.rb

@@ -108,6 +108,7 @@ module EgovUtils
 
       require 'egov_utils/helpers/tags/datetime_field_patch'
       ActionView::Helpers::Tags::DatetimeField.prepend(EgovUtils::Helpers::Tags::DatetimeFieldPatch)
+      ActionView::Helpers::Tags::DatetimeLocalField.prepend(EgovUtils::Helpers::Tags::DatetimeLocalFieldPatch)
 
       ActionView::Helpers::Tags::DateField.redefine_method(:format_date) do |value|
         value.try(:strftime, BootstrapForm::DATE_FORMAT_RUBY)

data/lib/egov_utils/helpers/tags/datetime_field_patch.rb

@@ -17,6 +17,13 @@ module EgovUtils
           end
 
       end
+
+      module DatetimeLocalFieldPatch
+        private
+          def format_date(value)
+            value.try(:strftime, "%Y-%m-%dT%H:%M")
+          end
+      end
     end
   end
 end

data/lib/egov_utils/version.rb

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

metadata

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