Apply ConfirmDangerModal for project transfer/remove actions

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
gitlabhq · Oct 8, 2014 · 74217f7 · 74217f7
1 parent 9021deb
commit 74217f7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
@@ -177,6 +177,13 @@ $ ->
     $(@).closest(".diff-file").find(".notes_holder").toggle()
     e.preventDefault()
 
+  $(document).on "click", '.js-confirm-danger', (e) ->
+    e.preventDefault()
+    btn = $(e.target)
+    text = btn.data("confirm-danger-message")
+    form = btn.closest("form")
+    new ConfirmDangerModal(form, text)
+
 (($) ->
   # Disable an element and add the 'disabled' Bootstrap class
   $.fn.extend disable: ->

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
@@ -56,6 +56,10 @@ def remove_project_message(project)
     "You are going to remove #{project.name_with_namespace}.\n Removed project CANNOT be restored!\n Are you ABSOLUTELY sure?"
   end
 
+  def transfer_project_message(project)
+    "You are going to transfer #{project.name_with_namespace} to another owner. Are you ABSOLUTELY sure?"
+  end
+
   def project_nav_tabs
     @nav_tabs ||= get_project_nav_tabs(@project, current_user)
   end

diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
@@ -104,7 +104,7 @@
                 %strong Once active this project shows up in the search and on the dashboard.
               = link_to 'Unarchive', unarchive_project_path(@project),
                   data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be committed to again." },
-                  method: :post, class: "btn btn-remove"
+                  method: :post, class: "btn btn-success"
             - else
               %p
                 Archiving the project will mark its repository as read-only.
@@ -154,20 +154,21 @@
                     %li You can only transfer the project to namespaces you manage.
                     %li You will need to update your local repositories to point to the new location.
               .form-actions
-                = f.submit 'Transfer', class: "btn btn-remove"
+                = f.submit 'Transfer', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => transfer_project_message(@project) }
       - else
         .nothing-here-block Only the project owner can transfer a project
 
       - if can?(current_user, :remove_project, @project)
         .panel.panel-default.panel.panel-danger
           .panel-heading Remove project
           .panel-body
-            %p
-              Removing the project will delete its repository and all related resources including issues, merge requests etc.
-              %br
-              %strong Removed projects cannot be restored!
+            = form_tag(project_path(@project), method: :delete, html: { class: 'form-horizontal'}) do
+              %p
+                Removing the project will delete its repository and all related resources including issues, merge requests etc.
+                %br
+                %strong Removed projects cannot be restored!
 
-            = link_to 'Remove project', @project, data: { confirm: remove_project_message(@project) }, method: :delete, class: "btn btn-remove"
+              = link_to 'Remove project', '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_project_message(@project) }
       - else
         .nothing-here-block Only project owner can remove a project
 
@@ -177,3 +178,6 @@
       %i.fa.fa-spinner.fa-spin
       Saving project.
     %p Please wait a moment, this page will automatically refresh when ready.
+
+
+= render 'shared/confirm_modal', phrase: @project.path