egov_utils 0.1.33 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92bef22b1b9870d23546ffde2cbc855dcf9a2083bdded39287c53ac1ca6e5f28
-  data.tar.gz: 391f6a6683c73af654d7a867babdec02f2a50dd15cc8ab8b6588b3a2aea13850
+  metadata.gz: 9c4dbda3371757f34c4093f2e58f05ba21c6750c567d27962577f6002aa894b6
+  data.tar.gz: a43a27f761857247f2b001225dc2a8222a47e317d870fef7ace360ec0e3b682f
 SHA512:
-  metadata.gz: bab9b672003e4840fef011bb0d6ce21774eb3947b26ecea6d05e0cb37565182d18df484f10c61bf10da31eb99b643a95facaa2c0e425910527384e24c5ea322a
-  data.tar.gz: dd329791d3ee7df5cde3a81cc1e4b1e42dfe040855ef4ed1b4fc690b47171d13c4089b28de64d02b0c6112dec0af49b9191154c5b4cfdc65ec1fdd8f413fedff
+  metadata.gz: 68e8a489421ebaca129737565cc70f0c0f2a5c4a03bbc8a6b62c623f1ad425acf2e553127aaf03e90f81a320a055ce6499b71936d7207fa3a213108f19643f0a
+  data.tar.gz: 57b1603c7b2f9e99a91deb4da0faa5f9d10c5e3a84d05b473221488d5267884530251dcf526b4d9cbca9a0c446a717856c6d12b8f5a357be3e961c119993aeec

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

@@ -17,16 +17,30 @@ window.eGovUtilities =
       close: 'fa fa-close'
     }
 
+    $(document).on 'change', '.custom-file-input:file', ()->
+      $input = $(this)
+      numFiles = if this.files then this.files.length else 1
+      label = $input.val().replace(/\\/g, '/').replace(/.*\//, '')
+      $input.trigger('fileselect', [numFiles, label])
+      $input.parent().find('.custom-file-control').text(label);
+
 
   initPage: ($container)->
     $container ||= $(document)
     eGovUtilities.initDatepickers($container)
     eGovUtilities.initSelect2($container)
+    eGovUtilities.initFileFields($container)
 
   clearBeforeCache: ($container)->
     $container ||= $(document)
     eGovUtilities.destroySelect2($container)
 
+  initFileFields: ($container)->
+    $('.custom-file-input:file').each ()->
+      $input = $(this)
+      label = $input.val().replace(/\\/g, '/').replace(/.*\//, '')
+      $input.parent().find('.custom-file-control').text(label);
+
   initDatepickers: ($container)->
     $container ||= $(document)
     if !Modernizr.inputtypes.date

data/app/controllers/egov_utils/users_controller.rb

@@ -21,8 +21,13 @@ module EgovUtils
       @user.mail ||= @user.login
       respond_to do |format|
         if @user.save
-          UserMailer.confirmation_email(@user).deliver_later if EgovUtils::Settings.allow_register? && !current_user.logged?
-          format.html{ redirect_to main_app.root_path, notice: t('activerecord.successful.messages.created', model: User.model_name.human) }
+          if EgovUtils::Settings.allow_register? && !current_user.logged?
+            UserMailer.confirmation_email(@user).deliver_later
+            flash[:notice] = t('notice_signeup_with_mail')
+          else
+            flash[:notice] = t('activerecord.successful.messages.created', model: User.model_name.human)
+          end
+          format.html{ redirect_to main_app.root_path }
           format.json{ render json: @user, status: :created }
         else
           format.html{ render 'new' }
@@ -47,6 +52,7 @@ module EgovUtils
       render_404 and return unless @user || @user.active? || @user.updated_at < (Time.now - 24.hours)
       @user.update(active: true)
       logged_user = @user
+      flash[:notice] = t('success_user_confirm')
       redirect_to('/')
     end
 

data/app/views/layouts/egov_utils/_messages.html.haml

@@ -1,6 +1,6 @@
 - flash.each do |name, msg|
   - if msg.is_a?(String)
-    %div{:class => "alert alert-#{name.to_s == 'notice' ? "info" : (name.to_s == 'error' ? "alert" : name.to_s)} alert-dismissible fade show", "role" => "alert"}
+    %div{:class => "alert alert-#{name.to_s == 'notice' ? "info" : (name.to_s == 'error' ? "danger" : name.to_s)} alert-dismissible fade show", "role" => "alert"}
       %button.close{'type' => 'button', 'data-dismiss' => 'alert'}
         %span{'aria-hidden' => 'true'}= raw '×'
       = msg

data/config/locales/cs.yml

@@ -21,6 +21,8 @@ cs:
   notice_account_pending: Váš účet čeká na schválení/ověření
   notice_account_locked: Váš účet byl uzamčen správcem aplikace
   notice_logout: Byl/a jste úspěšně odhlášen/a
+  notice_signeup_with_mail: Registrace proběhla úspěšně, byl Vám odeslán potvrovací e-mail, prosím zkontrolujte svou poštu.
+  success_user_confirm: Váše e-mailová adresa byla potvrzena. Nyní se již můžete přihlásit.
 
   label_approve: Schválit
   label_new: Nový
@@ -40,13 +42,13 @@ cs:
 
 
   models: &my_models
-    egov_utils::user:
+    egov_utils/user:
       one: Uživatel
-      others: Uživatelé
-    egov_utils::group:
+      other: Uživatelé
+    egov_utils/group:
       one: Skupina
-      others: Skupiny
-    egov_utils::address:
+      other: Skupiny
+    egov_utils/address:
       one: Adresa
       other: Adresy
 

data/lib/bootstrap_form/check_box_patch.rb

@@ -0,0 +1,49 @@
+module BootstrapForm
+  module CheckBoxPatch
+
+    # TODO: post to upstream
+    def check_box(name, options = {}, checked_value = "1", unchecked_value = "0", &block)
+      options = options.symbolize_keys!
+      check_box_options = options.except(:label, :label_class, :wrapper_class, :help, :inline)
+
+      label_classes = [options[:label_class], 'form-check-label']
+      unless options.delete(:skip_required)
+        label_classes << "required" if required_attribute?(object, name)
+      end
+      options[:label_class] = label_classes.compact.join(' ')
+
+
+      check_box_options[:class] = ['form-check-input', check_box_options[:class]].compact.join(' ')
+
+
+      html = check_box_without_bootstrap(name, check_box_options, checked_value, unchecked_value)
+      label_content = block_given? ? capture(&block) : options[:label]
+      html.concat(' ').concat(label_content || (object && object.class.human_attribute_name(name)) || name.to_s.humanize)
+
+      label_name = name
+      # label's `for` attribute needs to match checkbox tag's id,
+      # IE sanitized value, IE
+      # https://github.com/rails/rails/blob/c57e7239a8b82957bcb07534cb7c1a3dcef71864/actionview/lib/action_view/helpers/tags/base.rb#L116-L118
+      if options[:multiple]
+        label_name =
+          "#{name}_#{checked_value.to_s.gsub(/\s/, "_").gsub(/[^-\w]/, "").downcase}"
+      end
+
+      disabled_class = " disabled" if options[:disabled]
+      label_class    = options[:label_class]
+
+      if options[:inline]
+        label_class = " #{label_class}" if label_class
+        label(label_name, html, class: "checkbox-inline#{disabled_class}#{label_class}")
+      else
+        wrapper_class = ['form-checkbox', options[:wrapper_class]]
+        wrapper_class << error_class if has_error?(name)
+        wrapper_class = wrapper_class.compact.join(' ')
+        content_tag(:div, class: "#{wrapper_class}#{disabled_class}") do
+          label(label_name, html, class: label_class).concat(generate_help(name, options[:help]))
+        end
+      end
+    end
+
+  end
+end

data/lib/bootstrap_form/custom_file_field.rb

@@ -6,7 +6,7 @@ module BootstrapForm
       args << options
       form_group_builder(name, options.reverse_merge(control_class: nil)) do
         html = file_field_without_bootstrap(name, options.merge(class: 'custom-file-input')) + " " + content_tag('span', '', class: ['custom-file-control', options[:class]].compact.join(' '))
-        label('', html, class: "custom-file form-control")
+        label(name, html, class: "custom-file form-control")
       end
     end
 

data/lib/egov_utils/engine.rb

@@ -82,10 +82,9 @@ module EgovUtils
       require 'bootstrap_form'
 
       require 'bootstrap_form/helpers/bootstrap4'
-
+      # TODO: should be included in Helper, to support every submit tag
       BootstrapForm::FormBuilder.__send__(:prepend, BootstrapForm::Helpers::Bootstrap4)
-      
-      
+
       require 'bootstrap_form/datetimepicker'
       require 'bootstrap_form/fileuid'
       require 'bootstrap_form/select2'
@@ -99,6 +98,9 @@ module EgovUtils
       BootstrapForm::FormBuilder.__send__(:prepend, BootstrapForm::Select2)
       BootstrapForm::FormBuilder.__send__(:prepend, BootstrapForm::CustomFileField)
 
+      require 'bootstrap_form/check_box_patch'
+      BootstrapForm::FormBuilder.__send__(:prepend, BootstrapForm::CheckBoxPatch)
+
       require 'egov_utils/helpers/tags/datetime_field_patch'
       ActionView::Helpers::Tags::DatetimeField.prepend(EgovUtils::Helpers::Tags::DatetimeFieldPatch)
 

data/lib/egov_utils/routes/admin_constraint.rb

@@ -0,0 +1,9 @@
+module EgovUtils
+  class AdminConstraint
+    def matches?(request)
+      return false unless request.session[:user_id]
+      user = EgovUtils::User.find request.session[:user_id]
+      user && user.admin?
+    end
+  end
+end

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.1.33'
+  VERSION = '0.1.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.35
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -429,6 +429,7 @@ files:
 - db/migrate/20171103141234_add_birth_place_and_residence_to_people.rb
 - db/migrate/20171109172909_add_external_uid_to_groups.rb
 - db/migrate/20171115142450_add_confirmation_code_to_users.rb
+- lib/bootstrap_form/check_box_patch.rb
 - lib/bootstrap_form/custom_file_field.rb
 - lib/bootstrap_form/datetimepicker.rb
 - lib/bootstrap_form/fileuid.rb
@@ -442,6 +443,7 @@ files:
 - lib/egov_utils/helpers/form_helper.rb
 - lib/egov_utils/helpers/tags/datetime_field_patch.rb
 - lib/egov_utils/helpers/tags/fileuid_field.rb
+- lib/egov_utils/routes/admin_constraint.rb
 - lib/egov_utils/settings.rb
 - lib/egov_utils/test_utils/controller_helpers.rb
 - lib/egov_utils/user_utils/application_controller_patch.rb