egov_utils 0.4.13 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a797a55e12740ddf600abc9e4f94d57b199b616b1dbee8b833987279019a1394
-  data.tar.gz: 262c0bede9aa1b430561fcd0678af9586b2294abca916cab45a7c7cc2dc9b455
+  metadata.gz: 623d49b941cf0097538f303be8e559c71b487fe88617db75714fa23331eda159
+  data.tar.gz: 25893c6be77510eb4c2c53d2924ab1e25a4b1facafdb9e0d85be16e5dd05fe84
 SHA512:
-  metadata.gz: 6190427f09d3a34c7fad27fc72bf21ed8bf0918c153cd67417a95d9736bcefeb30e02d05c536166e4902f2cb9b55f6a9482d1242fbb0b7a81a8f96a02e10f901
-  data.tar.gz: c5bf2ac0e5886b9013c5038b82e5de9ef66dbb1bd1ba87623f973e23a3f02dea9e7c282fae780403c389837956e6e7849c6d7ef9b8a689a7a580c77842e6ad88
+  metadata.gz: 8522c843305e9771989b5057c5b1603f7ef81113df2017db17f655eb70ffb35e9bbfa5baee7670732cbe2b42994c6434a33b1f3dbaf681666a0550bc97ec329e
+  data.tar.gz: b40d3afbd9855d69c8d1c9f9627c90a7211c397d7f81854282d0c20c08fb4f5b55654791f64c98de57a4b936f94fb567afa864aa0c95f789285cfd6a5dfe3972

data/app/controllers/egov_utils/groups_controller.rb

@@ -25,7 +25,7 @@ module EgovUtils
     end
 
     def new_users
-      @principals = EgovUtils::User.active.not_in_group(@group)
+      @principals = EgovUtils::User.active.assignable_to_group(@group)
       respond_to do |format|
         format.html
         format.js { render_modal_js }
@@ -33,8 +33,8 @@ module EgovUtils
     end
 
     def add_users
-      render_404 and return if @group.allow_member_assign?
-      @users = User.not_in_group(@group).where(:id => (params[:user_id] || params[:user_ids])).to_a
+      render_404 and return unless @group.allow_member_assign?
+      @users = User.active.assignable_to_group(@group).where(:id => (params[:user_id] || params[:user_ids])).to_a
       @group.users << @users
       respond_to do |format|
         format.html { redirect_to group_path(@group) }

data/app/models/egov_utils/user.rb

@@ -31,6 +31,9 @@ module EgovUtils
       at = Arel::Table.new('egov_utils_groups_users', as: 'gu')
       where(arel_table[:id].not_in( at.project(at[:user_id]).where(at[:group_id].eq(group_id)) ))
     }
+    scope :assignable_to_group, ->(group) {
+      not_in_group(group).where(provider: nil)
+    }
 
     cattr_accessor :default_role
     self.default_role = nil

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.4.13'
+  VERSION = '0.4.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails