Fix redirects. Add link to new team and new group

diff --git a/app/controllers/admin/teams_controller.rb b/app/controllers/admin/teams_controller.rb
index 335add0..786957c 100644 (file)
--- a/app/controllers/admin/teams_controller.rb
+++ b/app/controllers/admin/teams_controller.rb
@@ -47,7 +47,7 @@ class Admin::TeamsController < Admin::ApplicationController
   def destroy
     user_team.destroy
 
-    redirect_to admin_user_teams_path, notice: 'Team of users was successfully deleted.'
+    redirect_to admin_teams_path, notice: 'Team of users was successfully deleted.'
   end
 
   protected

diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
index e69a092..1ac0d56 100644 (file)
--- a/app/controllers/teams_controller.rb
+++ b/app/controllers/teams_controller.rb
@@ -28,7 +28,7 @@ class TeamsController < ApplicationController
 
   def destroy
     user_team.destroy
-    redirect_to teams_path
+    redirect_to dashboard_path
   end
 
   def new

diff --git a/app/views/projects/_new_form.html.haml b/app/views/projects/_new_form.html.haml
index ba8f255..41a6021 100644 (file)
--- a/app/views/projects/_new_form.html.haml
+++ b/app/views/projects/_new_form.html.haml
@@ -15,12 +15,20 @@
         %span Namespace
       .input
         = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'chosen'}
-  - elsif current_user.can_create_group?
+
+  %p.padded
+    New projects are private by default. You choose who can see the project and commit to repository.
+  %hr
+
+  - if current_user.can_create_group?
     .clearfix
       .input.light
-        Need a group for several projects?
+        Need a group for several dependent projects?
         = link_to new_group_path, class: "btn very_small" do
           Create a group
-  %hr
-  %p.padded
-    New projects are private by default. You choose who can see the project and commit to repository.
+  - if current_user.can_create_team?
+    .clearfix
+      .input.light
+        Want to share a team between projects?
+        = link_to new_team_path, class: "btn very_small" do
+          Create a team