egov_utils 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91a41a52aa16a737cdca92ecbf8828ba6a62e8a8ddb9a935d603bc49655eb906
-  data.tar.gz: 34244798bfa65ce51f5ecd758b7595e75bfd37efed6befc0e7fc355853b876e8
+  metadata.gz: 36bbca48a22bfa3f235771d19b8fceae9f6b9c5ab9819c79b136088c356e83ca
+  data.tar.gz: 665ff8af88d1a37e1bffb0a3eb6ce301236e8ccb3bc19bfc607fcf532067de1d
 SHA512:
-  metadata.gz: '0835b1e2c4894906fd621c39ed989af6dce3fe0cfdb94247a827a14852c409d60010ee6dd2f9ceafbf5119f700fe55b27052dfbaffdc9097e87900760d0c6ccc'
-  data.tar.gz: cbc9623f6a67b1dc92a4075fab48ccd2ce519e3076a7b1c0557acbb490e27660279ae22e445e58edfbaa72fcfb4418f5adb7874a6021a56e38da9eb84143ad4e
+  metadata.gz: 14c5bf67f6f723d5b28a693799314464a64887d7fba6792e9118016105fef9c76f868c21f27e7eac43a87f00634b9552279cbb739c3f9136e441887782c07353
+  data.tar.gz: 6bd549656e6bfb9b3e782d7125e38838de680133ee5b3eddeaa5d6535f78bc1bda71659253735b78edb06f33449a5c35787340d4ed8c6fc3ffa75e07210e54f4

data/app/controllers/egov_utils/passwords_controller.rb

@@ -15,7 +15,7 @@ module EgovUtils
     def send_reset_token
       return render_404 unless EgovUtils::Settings.allow_password_reset?
       @user = EgovUtils::User.find_by(mail: params[:reset_password][:mail])
-      if @user
+      if @user && @user.password_change_possible?
         @token = @user.generate_reset_password_token
         EgovUtils::UserMailer.password_reset(@user, @token).deliver_later if @user.save
       end

data/app/controllers/egov_utils/users_controller.rb

@@ -6,14 +6,15 @@ module EgovUtils
 
     skip_before_action :require_login, only: [:new, :create, :confirm]
 
-    authorize_resource only: :index
-    load_and_authorize_resource only: [:new, :create, :show, :destroy]
+    load_and_authorize_resource
 
     def index
       providers
-      @users = EgovUtils::User.accessible_by(current_ability).order(:provider)
       @groups = EgovUtils::Group.accessible_by(current_ability).order(:provider)
       @new_user = EgovUtils::User.new(generate_password: true)
+      azahara_schema_index do |users|
+        users.add_sort('provider')
+      end
     end
 
     def new

data/app/schemas/egov_utils/user_schema.rb

@@ -5,6 +5,10 @@ module EgovUtils
       'fullname'
     end
 
+    def default_columns
+      ['fullname', 'provider', 'roles', 'groups']
+    end
+
     def initialize_available_attributes
       @available_attributes ||= []
       @available_attributes << AzaharaSchema::DerivedAttribute.new(model, 'fullname', :concat, 'lastname', 'firstname', schema: self)

data/app/views/egov_utils/users/_users_tab.html.haml

@@ -7,9 +7,9 @@
       %th= EgovUtils::User.human_attribute_name('groups')
       %th= t('label_actions')
   %tbody
-    - users.each do |user|
+    - users.entities.each do |user|
       %tr
-        %td= user.fullname
+        %td{title: user.login}= user.fullname
         %td= user.provider
         - if can?(:manage, user)
           %td.roles{data: {roles: user.roles, id: user.id}}= user.roles.join(', ')
@@ -19,7 +19,8 @@
           - user.groups.each do |g|
             %span= g.name
         %td
-          = button_to(t('label_delete'), user_path(user), method: :delete, class: 'btn btn-warning btn-sm')
+          - if can?(:delete, user)
+            = button_to(t('label_delete'), user_path(user), method: :delete, class: 'btn btn-warning btn-sm')
           - unless user.active?
             = button_to(t('label_approve'), approve_user_path(user), class: 'btn btn-primary btn-sm')
 

data/lib/egov_utils/settings.rb

@@ -11,12 +11,16 @@ module EgovUtils
 
     # namespace Rails.env
 
+    def allow_internal_accounts?
+      true
+    end
+
     def allow_register?
-      allow_register
+      allow_internal_accounts? && allow_register
     end
 
     def allow_password_reset?
-      allow_register? && allow_password_reset
+      allow_internal_accounts? && allow_password_reset
     end
 
   end

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.3.9'
+  VERSION = '0.3.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -675,7 +675,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: The eGoverment utilities is set of functionalities to support basic eGoverment