Get confirmation before deleting right, refs #7650

Get confirmation from the user before deleting a right.

apps/qubit/modules/digitalobject/config/view.yml

@@ -4,4 +4,3 @@ editSuccess:
     /plugins/sfDrupalPlugin/vendor/drupal/misc/collapse:
     /plugins/sfDrupalPlugin/vendor/drupal/misc/form:
     description:
-    deleteBasisRight.js:

apps/qubit/modules/informationobject/actions/indexAction.class.php

@@ -109,11 +109,6 @@ public function execute($request)
 
     $this->dispatcher->notify(new sfEvent($this, 'access_log.view', array('object' => $this->resource)));
 
-    // Specified here instead of view.yml so plugins calling
-    // calling inheriting and calling parent::execute also
-    // automatically load the file(s)
-    $this->getResponse()->addJavascript('deleteBasisRight.js', 'last');
-
     if (sfConfig::get('app_treeview_type__source', 'sidebar') == 'fullWidth')
     {
       $this->getResponse()->addStylesheet('fullWidthTreeView', 'last');

apps/qubit/modules/right/actions/deleteAction.class.php

@@ -22,16 +22,21 @@ class RightDeleteAction extends sfAction
   public function execute($request)
   {
     $this->right = $this->getRoute()->resource;
-    $relatedObject = $this->right->relationsRelatedByobjectId[0]->subject;
+    $this->relatedObject = $this->right->relationsRelatedByobjectId[0]->subject;
 
     // Check user authorization against the related object
-    if (!QubitAcl::check($relatedObject, 'delete'))
+    if (!QubitAcl::check($this->relatedObject, 'delete'))
     {
       QubitAcl::forwardUnauthorized();
     }
 
-    $this->right->delete();
+    if ($request->isMethod('delete'))
+    {
+      $this->right->delete();
+
+      return $this->redirect(array($this->relatedObject));
+    }
 
-    return $this->redirect(array($relatedObject));
+    $this->form = new sfForm;
   }
 }

apps/qubit/modules/right/templates/_right.php

@@ -2,7 +2,7 @@
   <h3><?php echo __('Related right') ?></h3>
   <?php if (QubitAcl::check($relatedObject, 'update')): ?>
     <a href="<?php echo url_for(array('module' => 'right', 'action' => 'edit', 'slug' => $resource->slug)) ?>">&nbsp;Edit</a> |
-    <a href="<?php echo url_for(array('module' => 'right', 'action' => 'delete', 'slug' => $resource->slug)) ?>"  class="deleteRightBasis">Delete</a>
+    <a href="<?php echo url_for(array('module' => 'right', 'action' => 'delete', 'slug' => $resource->slug)) ?>">Delete</a>
   <?php endif; ?>
 
   <div>

apps/qubit/modules/right/templates/deleteSuccess.php

@@ -0,0 +1,20 @@
+<?php decorate_with('layout_1col.php') ?>
+
+<?php slot('title') ?>
+  <h1><?php echo __('Are you sure you want to delete this right?') ?></h1>
+<?php end_slot() ?>
+
+<?php slot('content') ?>
+
+  <?php echo $form->renderFormTag(url_for(array($right, 'module' => 'right', 'action' => 'delete')), array('method' => 'delete')) ?>
+
+    <section class="actions">
+      <ul>
+        <li><?php echo link_to(__('Cancel'), $relatedObject, array('class' => 'c-btn')) ?></li>
+        <li><input class="c-btn c-btn-delete" type="submit" value="<?php echo __('Delete') ?>"/></li>
+      </ul>
+    </section>
+
+  </form>
+
+<?php end_slot() ?>