redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#1078 Can't assign user to folder

Browse Source
This commit is contained in:
Karel Pičman 2020-01-27 09:12:51 +01:00
parent dae656b285
commit 1b610a5cad
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/dmsf_folder_permissions_controller.rb
View File

@ -53,8 +53,10 @@ class DmsfFolderPermissionsController < ApplicationController
scope = Principal.active.visible.member_of(@project).like(params[:q]).order(:type, :lastname) scope = Principal.active.visible.member_of(@project).like(params[:q]).order(:type, :lastname)
if @dmsf_folder if @dmsf_folder
users = @dmsf_folder.permissions_users users = @dmsf_folder.permissions_users
ids = users.collect{ |u| u.id } if(users.any?)
scope = scope.where(['id NOT IN (?)', ids.join(',')]).order(:type, :lastname) ids = users.collect{ |u| u.id }
scope = scope.where.not(id: ids)
end
end end
scope.to_a scope.to_a
end end

2
app/helpers/dmsf_folder_permissions_helper.rb
View File

@ -23,7 +23,7 @@
module DmsfFolderPermissionsHelper module DmsfFolderPermissionsHelper
def users_checkboxes(users, inherited = false) def users_checkboxes(users, inherited = false)
s = '' s = +''
id = inherited ? 'inherited_permissions[user_ids][]' : 'permissions[user_ids][]' id = inherited ? 'inherited_permissions[user_ids][]' : 'permissions[user_ids][]'
users.each do |user| users.each do |user|
content = check_box_tag(id, user.id, true, disabled: inherited, id: nil) + user.name content = check_box_tag(id, user.id, true, disabled: inherited, id: nil) + user.name