From 52e62f718f56852daa541553acf28ec75d8d5ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 31 May 2018 14:00:36 +0200
Subject: [PATCH] Reduce CE/EE diff in app/views/admin/groups/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/models/group.rb                     | 9 +++++++--
 app/views/admin/groups/_form.html.haml  | 7 +++++++
 app/views/admin/groups/_group.html.haml | 3 +++
 app/views/admin/groups/show.html.haml   | 8 +++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/models/group.rb b/app/models/group.rb
index 8fb77a7869d..aeb50fb9bb7 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -141,13 +141,14 @@ class Group < Namespace
     )
   end
 
-  def add_user(user, access_level, current_user: nil, expires_at: nil)
+  def add_user(user, access_level, current_user: nil, expires_at: nil, ldap: false)
     GroupMember.add_user(
       self,
       user,
       access_level,
       current_user: current_user,
-      expires_at: expires_at
+      expires_at: expires_at,
+      ldap: ldap
     )
   end
 
@@ -195,6 +196,10 @@ class Group < Namespace
     owners.include?(user) && owners.size == 1
   end
 
+  def ldap_synced?
+    false
+  end
+
   def post_create_hook
     Gitlab::AppLogger.info("Group \"#{name}\" was created")
 
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
index dc4dccc9e0d..c8008771236 100644
--- a/app/views/admin/groups/_form.html.haml
+++ b/app/views/admin/groups/_form.html.haml
@@ -2,6 +2,9 @@
   = form_errors(@group)
   = render 'shared/group_form', f: f
 
+  = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group
+  = render_if_exists 'admin/namespace_plan', f: f
+
   .form-group.row.group-description-holder
     = f.label :avatar, "Group avatar", class: 'col-form-label col-sm-2'
     .col-sm-10
@@ -15,6 +18,8 @@
 
   = render 'groups/group_admin_settings', f: f
 
+  = render_if_exists 'namespaces/shared_runners_minutes_settings', group: @group, form: f
+
   - if @group.new_record?
     .form-group.row
       .offset-sm-2.col-sm-10
@@ -28,3 +33,5 @@
     .form-actions
       = f.submit 'Save changes', class: "btn btn-save"
       = link_to  'Cancel', admin_group_path(@group), class: "btn btn-cancel"
+
+= render_if_exists 'ldap_group_links/ldap_syncrhonizations', group: @group
diff --git a/app/views/admin/groups/_group.html.haml b/app/views/admin/groups/_group.html.haml
index e7c70a6f187..3f96988c203 100644
--- a/app/views/admin/groups/_group.html.haml
+++ b/app/views/admin/groups/_group.html.haml
@@ -1,3 +1,4 @@
+- group = local_assigns.fetch(:group)
 - css_class = 'no-description' if group.description.blank?
 
 %li.group-row{ class: css_class }
@@ -8,6 +9,8 @@
     %span.badge.badge-pill
       = storage_counter(group.storage_size)
 
+    = render_if_exists 'admin/namespace_plan_badge', namespace: group
+
     %span
       = icon('bookmark')
       = number_with_delimiter(group.projects.count)
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 6d75ccd5add..a40f98ad24f 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -40,6 +40,8 @@
           %strong
             = @group.created_at.to_s(:medium)
 
+        = render_if_exists 'admin/namespace_plan_info', namespace: @group
+
         %li
           %span.light Storage:
           %strong= storage_counter(@group.storage_size)
@@ -58,6 +60,10 @@
             = group_lfs_status(@group)
             = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
 
+        = render_if_exists 'namespaces/shared_runner_status', namespace: @group
+
+    = render_if_exists 'ldap_group_links/ldap_group_links_show', group: @group
+
     .card
       .card-header
         %h3.card-title
@@ -104,7 +110,7 @@
 
           = form_tag admin_group_members_update_path(@group), id: "new_project_member", class: "bulk_import", method: :put  do
             %div
-              = users_select_tag(:user_ids, multiple: true, email_user: true, scope: :all)
+              = users_select_tag(:user_ids, multiple: true, email_user: true, skip_ldap: @group.ldap_synced?, scope: :all)
             .prepend-top-10
               = select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2"
             %hr