Refactor nested group related codedz-nested-group-misc

* Simplify code around group parent access check
* Rename 'Nested groups' to 'Subgroups' tab at group#show page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 4 insertions, 10 deletions

diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb
index 9a630aee626..febeb661fb5 100644
--- a/app/services/groups/create_service.rb
+++ b/app/services/groups/create_service.rb
@@ -12,17 +12,11 @@ module Groups
         return @group
       end
 
-      parent_id = params[:parent_id]
+      if @group.parent && !can?(current_user, :admin_group, @group.parent)
+        @group.parent = nil
+        @group.errors.add(:parent_id, 'manage access required to create subgroup')
 
-      if parent_id
-        parent = Group.find(parent_id)
-
-        unless can?(current_user, :admin_group, parent)
-          @group.parent_id = nil
-          @group.errors.add(:parent_id, 'manage access required to create subgroup')
-
-          return @group
-        end
+        return @group
       end
 
       @group.name ||= @group.path.dup