From 94ba1f01084e2f71a4374383b2f90408843804da Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Fri, 3 Oct 2014 16:43:19 +0200 Subject: [PATCH] If project doesn't have a group, group ldap sync is false. --- app/models/project.rb | 8 ++++++++ app/views/projects/team_members/_form.html.haml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 9d69ed3d1c..9477a559a9 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -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 diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml index b3b45882ab..794723520e 100644 --- a/app/views/projects/team_members/_form.html.haml +++ b/app/views/projects/team_members/_form.html.haml @@ -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