Fix installation of English Nicknames (CO-2476)

skoranda · Sep 5, 2022 · 55b7752 · 55b7752
1 parent e6f58e8
commit 55b7752
Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/templates/AttributeMappings/columns.inc b/app/templates/AttributeMappings/columns.inc
@@ -19,7 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * @link          http://www.internet2.edu/comanage COmanage Project
+ * @link          https://www.internet2.edu/comanage COmanage Project
  * @package       match
  * @since         COmanage Match v1.0.0
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
@@ -43,8 +43,10 @@ $topLinks = [
     'label' => '<em class="material-icons" aria-hidden="true">file_download</em> ' . 
       __('match.op.AttributeMappings.install.nicknames.en'),
     'link'  => [
-      'action' => 'install',
+      'action'  => 'install',
+      '?'       => [
       'mapping' => 'nicknames.en'
+      ]
     ],
     'class' => 'buildbutton'
   ]

diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
@@ -104,7 +104,7 @@ function _column_key($modelsName, $c, $tz=null) {
               print '<li>' .
                 $this->Html->link(
                   $t['label'],
-                  array_merge($linkFilter, $t['link']),
+                  array_merge_recursive($linkFilter, $t['link']),
                   ['escape' => false, 'class' => $t['class']]
                 ) . '
               </li>';