egov_utils 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b19c8d6e9175e5b472c8b821d611c8cf7e3a19ee1dce31d8056b368bb367fec
-  data.tar.gz: 5dbcfd93cc21019f96569688aac9023032e9c6900617882b0de4352e87525ce8
+  metadata.gz: 585c09c56185466217fcb9c1049174c16ba16a9fc90d234ac02346c941c14968
+  data.tar.gz: 3aa699ebeb3b447a91c2496501d60170cb6c24af4eeee4753a57f4dca57fb4e2
 SHA512:
-  metadata.gz: 6fcb6a35215f2dbbb0d5468551d21b492d03ee15a5a885758d8ac340cba4cdfed1c0c3d0f9f03b3b7c7e20c171866147e201c42cd82b8e781fbaba8f76e5be5d
-  data.tar.gz: 3570ce94d514b715bb68016264488bb4f3cfc4a65f11d1deed2a347c90c167442cc4368f11a17485db955d6c9d7f06fdf1d00ea19d95e577a9a81c4fb3eeb25b
+  metadata.gz: aac00f0be9b55879ac4012032d64b865dc90ca6c396ec47e24d5473c5231dc1a4cce7497de769fdafa6be13e5b432300b8c9cce7735edcaeaeca42fa6bc0e8dc
+  data.tar.gz: a011fdcefb2af10b0810bdcb356969232c22465eb10433113e30a2343747ace35c0ed50c303796128df6d23edbb66f4108fb91ae9af72d8131a9b1cb692135f5

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.udpate_column(active: false)
+        end
+
+        user.update_column(:last_login_at, Time.now) if user.active?
+      end
+
       user
     end
 

data/app/resources/egov_utils/organization.rb

@@ -14,10 +14,12 @@ module EgovUtils
       all.detect{ |o| o.key == key }
     end
 
-    def self.courts(organization_keys=nil)
+    def self.courts(organization_keys=nil, include_branches: true)
       all.select do |o|
         %w{OS KS MS}.include?(o.category_abbrev) &&
           (organization_keys.nil? || organization_keys.include?(o.key))
+      end.tap do |collection|
+        collection.select { _1.branch_of_id.nil? } unless include_branches
       end
     end
 
@@ -34,9 +36,10 @@ module EgovUtils
       where(key: key).first
     end
 
-    def self.courts(organization_keys=nil)
+    def self.courts(organization_keys=nil, include_branches: true)
       filters = {category_abbrev: ['OS','KS', 'MS']}
       filters.merge!(key: organization_keys) if organization_keys.present?
+      filters.merge!(branch_of_id: [nil]) unless include_branches
       all(params: {f: filters, sort: {'0' => {path: 'category_abbrev'} }})
     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.3'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-03-31 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