Make build button available to Matchgrid Admins (CO-1765)

COmanage · Nov 17, 2019 · efbc622 · efbc622
1 parent 683b763
commit efbc622
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/app/src/Controller/MatchgridsController.php b/app/src/Controller/MatchgridsController.php
@@ -49,7 +49,7 @@ class MatchgridsController extends StandardController {
   public function beforeFilter(\Cake\Event\Event $event) {
     // Only certain actions require a matchgrid ID
     if(in_array($this->request->getParam('action'), 
-                ['manage', 'pending', 'reconcile'])) {
+                ['build', 'manage', 'pending', 'reconcile'])) {
       $this->Matchgrids->setRequiresMatchgrid(true);
     }
 
@@ -72,7 +72,7 @@ public function build(int $id) {
       $this->Flash->error(__('match.er.build', [$e->getMessage()]));
     }
 
-    return $this->redirect(['action' => 'index']);
+    return $this->redirect(['action' => 'manage', $id]);
   }
 
   /**

diff --git a/app/src/Locale/en_US/default.po b/app/src/Locale/en_US/default.po
@@ -227,6 +227,9 @@ msgstr "Invalid character found"
 msgid "match.er.mgid"
 msgstr "Could not find Matchgrid ID in request"
 
+msgid "match.er.notfound"
+msgstr "{0} \"{1}\" not found"
+
 msgid "match.er.pagenum.exceeded"
 msgstr "Page number may not be larger than {0}"
 

diff --git a/app/src/Model/Table/MatchgridsTable.php b/app/src/Model/Table/MatchgridsTable.php
@@ -90,7 +90,7 @@ public function initialize(array $config) {
       ]
     ]);
 
-    $this->setAllowLookupPrimaryLink(['manage', 'pending', 'reconcile']);
+    $this->setAllowLookupPrimaryLink(['build', 'manage', 'pending', 'reconcile']);
   }
 
   /**

diff --git a/app/src/Template/Matchgrids/columns.inc b/app/src/Template/Matchgrids/columns.inc
@@ -42,9 +42,5 @@ $indexActions = [
   [
     'action' => 'manage',
     'class'  => 'configurebutton'
-  ],
-  [
-    'action' => 'build',
-    'class'  => 'buildbutton'
   ]
 ];
diff --git a/app/src/Template/Matchgrids/manage.ctp b/app/src/Template/Matchgrids/manage.ctp
@@ -36,6 +36,18 @@ declare(strict_types = 1);
 <!-- Matchgrid Management Menu -->
 <section class="inner-content">
   <ul id="configuration-menu" class="three-col">
+    <?php if($vv_permissions['build']): ?>
+    <li>
+      <em class="material-icons" aria-hidden="true">check_circle</em>
+      <?= $this->Html->link(__('match.op.build'),
+                            ['controller' => 'Matchgrids',
+                             'action' => 'build',
+                             $vv_cur_mg->id],
+                            ['confirm' => __('match.op.build.confirm')]);
+      ?>
+    </li>
+    <?php endif; // $vv_permissions['build'] ?>
+    <?php if($vv_permissions['reconcile']): ?>
     <li>
       <em class="material-icons" aria-hidden="true">check_circle</em>
       <?= $this->Html->link(__('match.op.reconcile'),
@@ -44,5 +56,6 @@ declare(strict_types = 1);
                              $vv_cur_mg->id]);
       ?>
     </li>
+    <?php endif; // $vv_permissions['reconcile'] ?>
   </ul>
-</section>
+</section>
diff --git a/app/src/Template/Matchgrids/select.ctp b/app/src/Template/Matchgrids/select.ctp
@@ -70,18 +70,6 @@ use \App\Lib\Enum\PermissionEnum;
                                    $id],
                                   ['class' => 'configurebutton']);
         }
-
-        // Can reconcile this matchgrid?
-        if((isset($vv_menu_permissions['gridroles'][$id][PermissionEnum::ReconciliationManager])
-            && $vv_menu_permissions['gridroles'][$id][PermissionEnum::ReconciliationManager])
-           // Proxy for platform admin
-           || $vv_menu_permissions['matchgrids']) {
-          print $this->Html->link(__('match.op.reconcile'),
-                                  ['controller' => 'Matchgrids',
-                                   'action'     => 'pending',
-                                   $id],
-                                  ['class' => 'reconcilebutton']);
-        }
       ?>
     </div>
   </div>