egov_utils 0.6.4 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c9bb03cd2bb748b5d32a2ff051bd1083028d19f4c69c65637112722b871bcf
-  data.tar.gz: c160099429bee03754890907732dce50704f0430cb3bebcb2b3912f64d03a0ce
+  metadata.gz: d0fb4d51f6f37b8c70952049ec7570dec41ad52272155c457f24a3326223319b
+  data.tar.gz: b689068162ba29eed688e46a44ebb92286634187854c29aa73d1e898f53abc69
 SHA512:
-  metadata.gz: 3833e1edb4557b8d67b3c102f3861c86f965ae9530f04af2ea37b654a13cc88b67f2f8a195675e243c46ea5e785765e58449a1c8e4f60466ddc0e139eb531de2
-  data.tar.gz: 2c678e87567ac4ee0a774463a0f92ccb93c973c380675db3b8400e0519eaa9a3923943ed5fce5dbef597d55e771759aaeac842fb8b332f1eef9227035a751d77
+  metadata.gz: c58af4cd7c8f02e87536fb5b5f0b347b4d03ddfc326a93c8e705627b3631d064206fc0fccef02e72f45b40f6679f6de048c36044230273a9964aead64f441ec5
+  data.tar.gz: ed7a4cc54856c518f91b35791974700f3485af6210899a7c940e7eb75114800a4f3104368ba4db650646ac8fd73d6a51817902430c2dc9fe0c7d900f399fa7fb

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 < (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/common/_grid.html.coffee

@@ -98,25 +98,27 @@ $ ->
       <% schema.columns.each do |col| %>
       <%= raw column_for_grid(grid, col) %>
       <% end %>
-      <% if can?(:update, schema.model) || (local_assigns.fetch(:allow_delete, false) && can?(:destroy, schema.model)) %>
-      {
-        width: 150
-        title: "<%= t('label_actions') %>"
-        buttons: [
-          <% if can?(:read, schema.model) %>
-            <% local_assigns.fetch(:downloads, {}).each do |format, label| %>
-              { cls: 'btn btn-sm btn-secondary <%= "download-button-#{format}" %>', caption: '<%= label %>', click: prepareDownload('<%= format %>') },
+      <% unless local_assigns.fetch(:disable_actions, false) %>
+        <% if can?(:update, schema.model) || (local_assigns.fetch(:allow_delete, false) && can?(:destroy, schema.model)) %>
+        {
+          width: 150
+          title: "<%= t('label_actions') %>"
+          buttons: [
+            <% if can?(:read, schema.model) %>
+              <% local_assigns.fetch(:downloads, {}).each do |format, label| %>
+                { cls: 'btn btn-sm btn-secondary <%= "download-button-#{format}" %>', caption: '<%= label %>', click: prepareDownload('<%= format %>') },
+              <% end %>
             <% end %>
-          <% end %>
-          <% if can?(:update, schema.model) %>
-          {cls: 'btn btn-sm btn-primary', caption: '<%= t('label_edit') %>', click: editRecord},
-          <% end %>
-          <%= additional_grid_edit_buttons(schema) %>
-          <% if local_assigns.fetch(:allow_delete, false) && can?(:destroy, schema.model) %>
-          {commandName: 'delete', caption: '<%= t('label_delete') %>'}
-          <% end %>
-        ]
-      }
+            <% if can?(:update, schema.model) %>
+            {cls: 'btn btn-sm btn-primary', caption: '<%= t('label_edit') %>', click: editRecord},
+            <% end %>
+            <%= additional_grid_edit_buttons(schema) %>
+            <% if local_assigns.fetch(:allow_delete, false) && can?(:destroy, schema.model) %>
+            {commandName: 'delete', caption: '<%= t('label_delete') %>'}
+            <% end %>
+          ]
+        }
+        <% end %>
       <% end %>
     ],
     sorting:

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.4'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.1
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2022-04-01 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