egov_utils 0.7.1 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0fb4d51f6f37b8c70952049ec7570dec41ad52272155c457f24a3326223319b
-  data.tar.gz: b689068162ba29eed688e46a44ebb92286634187854c29aa73d1e898f53abc69
+  metadata.gz: 77ce0843ebb4bc70b8389b530dd43dd45c232cea4c741ec014995c77cb259e61
+  data.tar.gz: 954dbe830452f604e681b87a6d33b8cefea419bcf141fbd5cebd088b3316e7c9
 SHA512:
-  metadata.gz: c58af4cd7c8f02e87536fb5b5f0b347b4d03ddfc326a93c8e705627b3631d064206fc0fccef02e72f45b40f6679f6de048c36044230273a9964aead64f441ec5
-  data.tar.gz: ed7a4cc54856c518f91b35791974700f3485af6210899a7c940e7eb75114800a4f3104368ba4db650646ac8fd73d6a51817902430c2dc9fe0c7d900f399fa7fb
+  metadata.gz: b7394626c5d9f1771c679de090479739c1d78f212d9cada20f4dafbc6eebfcbedc336348c7b2b34192f6ce6b20165136cbc9d3750090f5b06318001038d56675
+  data.tar.gz: 1f3f2e7c890eac9696bcf862d856758cee4280fe49e9ff5bc20d98af8884ee020d2ebff85e4fbe644f3050ddc0365ef1972d093a334f38d212ea331116028415

data/app/controllers/egov_utils/people_controller.rb

@@ -9,7 +9,7 @@ module EgovUtils
       respond_to do |format|
         if params['_type'] == 'query'
           format.json{ render json: {
-            results: @people_schema.entities.collect do |p|
+            results: @people_schema.entities.includes(:residence).collect do |p|
                 {id: p.id, text: p.to_s, residence: p.residence.to_s}
               end
           }}

data/app/controllers/egov_utils/users_controller.rb

@@ -64,7 +64,7 @@ module EgovUtils
       @user = User.find_by(id: params[:id])
       render_404 and return if @user.nil? || @user.active?
       authorize!(:manage, User)
-      @user.update(active: true)
+      @user.update(active: true, last_login_at: Time.current)
       redirect_back(fallback_location: @user)
     end
 

data/app/models/egov_utils/user.rb

@@ -66,8 +66,8 @@ module EgovUtils
 
       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)
+        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?

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.7.1'
+  VERSION = '0.7.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.4
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails