egov_utils 0.6.5 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7272a3c0cac6560ef3b6244bb42668eec41cf9c45526b00aa0e3359459fc79c2
-  data.tar.gz: efa34b24439875bb9a5ec5f6484264a6862234e4f806bc0de50c1e3bbc94f328
+  metadata.gz: 45926975307ac0185bf837788bb5d0391b031e5c1772ae4b2e01cfd17d8a59c0
+  data.tar.gz: 7c2af128ab6e9d2e5ec00b7b7ec2b69fd95d5fa268cbe25beb53fb94abee093d
 SHA512:
-  metadata.gz: bbc0af4ecbbc3053f2f2acac70fa3ff230c76fca968bd4c6f8df7f6aad50ebb7f220b133651c809a9f1fce7030ff22519022916772f58015061deaf274743774
-  data.tar.gz: b9406e6401ba19e89d1caa1435173069966e8447d9734140b150950d6440812b53533b6c0079241ab07ced94ba279ccea54ef191675955c62cad35f962ba2b1b
+  metadata.gz: 676aebd939af9730219ec9e5e2b45fe1acc47b63a1d308d58dca94aab8e31fc2051e37ce1e53e3842a2ada7a1c1c37162510a135b2c79dd0535f6dbb6f2fad1f
+  data.tar.gz: ae63960e5446f72c787d11c02bd738468b38dbbb94a464a2e7d6ed47d3ba59c3c49f97932280e45dc79d94ca8ee9d4bdb14439fcd3b01645cbfad599c0effc96

data/app/controllers/egov_utils/users_controller.rb

@@ -4,9 +4,9 @@ require_dependency "egov_utils/auth_source"
 module EgovUtils
   class UsersController < ApplicationController
 
-    skip_before_action :require_login, only: [:new, :create, :confirm]
+    skip_before_action :require_login, only: [:new, :create, :confirm, :edit, :update]
 
-    load_and_authorize_resource only: [:index, :new, :create, :show, :destroy]
+    load_and_authorize_resource only: [:index, :new, :create, :show, :destroy, :edit, :update]
 
     def index
       providers
@@ -46,6 +46,15 @@ module EgovUtils
     def show
     end
 
+    def edit
+    end
+
+    def update
+      @user.update(update_params)
+
+      redirect_to users_path, notice: t('activerecord.successful.messages.updated', model: User.model_name.human)
+    end
+
     def destroy
       @user.destroy
       redirect_to users_path, notice: t('activerecord.successful.messages.destroyed', model: User.model_name.human)
@@ -92,5 +101,9 @@ module EgovUtils
         params_to_permit << :generate_password if current_user.logged?
         params.require(:user).permit(*params_to_permit)
       end
+
+      def update_params
+        params.require(:user).permit(:days_before_inactive)
+      end
   end
 end

data/app/models/egov_utils/user.rb

@@ -63,7 +63,16 @@ module EgovUtils
           end
         end
       end
-      user.update_column(:last_login_at, Time.now) if user && !user.new_record? && user.active?
+
+      if user && !user.new_record?
+        # Check last login
+        if user.days_before_inactive && (user.last_login_at || user.created_at) < (Time.now - user.days_before_inactive.days)
+          user.update_column(:active, false)
+        end
+
+        user.update_column(:last_login_at, Time.now) if user.active?
+      end
+
       user
     end
 

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

@@ -23,6 +23,8 @@
             = button_to(t('label_delete'), user_path(user), method: :delete, class: 'btn btn-warning btn-sm')
           - if can?(:manage, user) && user.password_change_possible?
             = link_to(t('label_change_password'), new_password_path(user), class: 'btn btn-secondary btn-sm')
+          - if can?(:edit, user)
+            = link_to(t('label_edit'), edit_user_path(user), class: 'btn btn-secondary btn-sm')
           - unless user.active?
             = button_to(t('label_approve'), approve_user_path(user), class: 'btn btn-primary btn-sm')
 

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

@@ -0,0 +1,4 @@
+= bootstrap_form_for(@user) do |f|
+  = f.text_field :days_before_inactive
+  .form-actions
+    = f.submit

data/config/locales/cs.yml

@@ -90,6 +90,7 @@ cs:
 
   model_attributes: &my_attributes
     egov_utils/user:
+      days_before_inactive: Počet dní od posledního přihlášení před deaktivací
       login: Přihlašovací email
       mail: E-mail
       password_confirmation: Potvrzení hesla
@@ -137,6 +138,7 @@ cs:
 
   model_help_messages: &my_help_messages
     egov_utils/user:
+      days_before_inactive: Pokud ponecháte pole prázdné, uživatelský účet nebude expirovat.
       generate_password: Heslo bude vygenerováno a posláno uživateli na e-mail, při prvním přihlášení bude heslo muset změnit.
 
 
@@ -154,6 +156,8 @@ cs:
       mail: E-mailová adresa
 
   submits: &my_submits
+    user:
+      update: Aktualizovat uživatele
     password_change:
       submit: Změnit heslo
 

data/db/migrate/20220331113917_add_days_before_inactive_to_egov_utils_users.rb

@@ -0,0 +1,5 @@
+class AddDaysBeforeInactiveToEgovUtilsUsers < ActiveRecord::Migration[6.1]
+  def change
+    add_column :egov_utils_users, :days_before_inactive, :integer, default: 365
+  end
+end

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.6.5'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.2
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -581,6 +581,7 @@ files:
 - app/views/egov_utils/users/_form.html.haml
 - app/views/egov_utils/users/_ldap_search.html.haml
 - app/views/egov_utils/users/_users_tab.html.haml
+- app/views/egov_utils/users/edit.html.haml
 - app/views/egov_utils/users/index.html.haml
 - app/views/egov_utils/users/new.html.haml
 - app/views/egov_utils/users/show.html.haml
@@ -613,6 +614,7 @@ files:
 - db/migrate/20180403141531_join_people_tables.rb
 - db/migrate/20180403150556_create_egov_utils_legal_people.rb
 - db/migrate/20180424143207_add_titles_to_natural_people.rb
+- db/migrate/20220331113917_add_days_before_inactive_to_egov_utils_users.rb
 - lib/azahara_schema_currency.rb
 - lib/azahara_schema_currency/aggregation_attribute_patch.rb
 - lib/azahara_schema_currency/association_attribute_patch.rb