Merge branch 'fix_for_project_without_group' into 'master'

Fix for project without group

See merge request !192
This commit is contained in:
Dmitriy Zaporozhets
2014-10-03 15:11:50 +00:00
2 changed files with 9 additions and 1 deletions
+8
View File
@@ -623,4 +623,12 @@ class Project < ActiveRecord::Base
def origin_merge_requests
merge_requests.where(source_project_id: self.id)
end
def group_ldap_synced?
if group
group.ldap_synced?
else
false
end
end
end
@@ -12,7 +12,7 @@
.form-group
= f.label :user_ids, "People", class: 'control-label'
.col-sm-10
= users_select_tag(:user_ids, { multiple: true, skip_ldap: @project.group.ldap_synced? })
= users_select_tag(:user_ids, { multiple: true, skip_ldap: @project.group_ldap_synced? })
%p 2. Set access level for them
.form-group