Errata

COmanage · Jan 22, 2022 · 9ccb9cc · 9ccb9cc
1 parent 6e1453c
commit 9ccb9cc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/app/src/Controller/DashboardsController.php b/app/src/Controller/DashboardsController.php
@@ -92,7 +92,7 @@ public function configuration() {
 
       $platformMenuItems = [
         __d('controller', 'Cos', [99]) => [
-          'icon'          => 'build',  // XXX kind of want house here, but maybe need newer material icons?
+          'icon'          => 'home',
           'controller'    => 'cos',
           'action'        => 'index'
         ]

diff --git a/app/src/Lib/Traits/PrimaryLinkTrait.php b/app/src/Lib/Traits/PrimaryLinkTrait.php
@@ -49,7 +49,7 @@ trait PrimaryLinkTrait {
   private $lookupActions = ['delete', 'edit', 'view'];
 
   // Where to redirect on add or edit, can be 'self', 'index', or 'primaryLink'
-  private $redirectGoal = ['index'];
+  private $redirectGoal = 'index';
 
   // Accept the current CO ID?
   private $acceptCoId = false;
@@ -252,6 +252,18 @@ public function setAllowLookupPrimaryLink(array $actions) {
     $this->lookupActions = array_merge($this->lookupActions, $actions);
   }
 
+  /**
+   * Set which actions permit a primary link to be passed as a request parameter.
+   * Defaults to [add, index].
+   * 
+   * @since  COmanage Registry v5.0.0
+   * @param  array $actions Array of actions that permit unkeyed primary links.
+   */
+
+  public function setAllowUnkeyedPrimaryLink(array $actions) {
+    $this->unkeyedActions = array_merge($this->unkeyedActions, $actions);
+  }
+
   /**
    * Set the current CO ID. Intended for use with AppController.
    *
@@ -280,18 +292,6 @@ public function setPrimaryLink($field) {
     }
   }
 
-  /**
-   * Set which actions permit a primary link to be passed as a request parameter.
-   * Defaults to [add, index].
-   * 
-   * @since  COmanage Registry v5.0.0
-   * @param  array $actions Array of actions that permit unkeyed primary links.
-   */
-
-  public function setAllowUnkeyedPrimaryLink(array $actions) {
-    $this->unkeyedActions = array_merge($this->unkeyedActions, $actions);
-  }
-
   /**
    * Set the redirect goal for this table. 
    *

diff --git a/app/templates/Dashboards/configuration.php b/app/templates/Dashboards/configuration.php
@@ -36,7 +36,7 @@
             $linkContent =  '<em class="material-icons" aria-hidden="true">' . $cfg['icon'] . '</em>'
               . '<span class="menu-title">' . $label . '</span>';
             print $this->Html->link(
-              $label,
+              $linkContent,
               ['plugin'     => null,
                'controller' => $cfg['controller'],
                'action'     => $cfg['action']],

diff --git a/app/templates/Names/columns.inc b/app/templates/Names/columns.inc
@@ -42,7 +42,7 @@ $indexColumns = [
 $indexActions = [
   [
     'action' => 'primary',
-    'class' => 'linkbutton',
+    'icon' => 'publish',
     'if' => 'notPrimary'
   ]
 ];