Merge branch 'hotfix-1.1.x' into develop

app/config/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

app/src/Lib/Identifier/Sequence.php

@@ -45,14 +45,17 @@ class Sequence extends ReferenceIdService {
 
   public function generate(\App\Model\Entity\Matchgrid $mgConfig, DBALConnection $dbc) {
     // The prefix is optional and configured by the admin
-    $prefix = $mgConfig->matchgrid_setting->getReferenceIdPrefix($mgConfig->id);
+    $MatchgridSettings = TableRegistry::getTableLocator()->get('MatchgridSettings');
+
+    $prefix = $MatchgridSettings->getReferenceIdPrefix($mgConfig->id);
+    $seqName = $mgConfig->matchgrid_setting->ref_id_sequence_name;
 
-    $sql = "SELECT nextval(' . $mgConfig->matchgrid_setting->ref_id_sequence_name . ')";
+    $sql = "SELECT nextval('$seqName')";
 
     $stmt = $dbc->Prepare($sql);
 
     $resultSet = $stmt->executeQuery();
 
     return $prefix . $resultSet->fetchOne();
   }
-}
+}

app/templates/Standard/index.php

@@ -222,12 +222,14 @@ function _column_key($modelsName, $c, $tz=null) {
       $addLink = $addLinkFilter($addLink, $this->request);
     }
 
-    $action_args['vv_actions'][] = array(
-      'order' => $this->Menu->getMenuOrder('Add'),
-      'icon' => $this->Menu->getMenuIcon('Add'),
-      'url' => $this->Url->build($addLink),
-      'label' => __('match.op.add.a', __('match.ct.'.$vv_modelname, [1]))
-    );
+    if($addLink) {
+      $action_args['vv_actions'][] = array(
+        'order' => $this->Menu->getMenuOrder('Add'),
+        'icon' => $this->Menu->getMenuIcon('Add'),
+        'url' => $this->Url->build($addLink),
+        'label' => __('match.op.add.a', __('match.ct.'.$vv_modelname, [1]))
+      ); 
+    }
 
     // Output the topLinks
     if(!empty($action_args['vv_actions'])) {

container/aws_buildspec.yml

@@ -3,7 +3,7 @@ version: 0.2
 env:
   shell: bash
   variables:
-    LABEL: "1.1.0"
+    LABEL: "1.1.1"
   exported-variables:
     - LABEL
 

container/aws_buildspec_hotfix-1.1.x.yml

@@ -0,0 +1,24 @@
+version: 0.2
+
+env:
+  shell: bash
+
+phases:
+  pre_build:
+    commands:
+      - echo Logging in to Amazon ECR...
+      - aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/u0z2s2z8
+      - echo Logging in to Docker Hub
+      - docker login --username skoranda --password $HUB_DOCKER_COM_TOKEN
+  build:
+    commands:
+      - echo Build started on `date`
+      - SHORT_COMMIT_HASH="${CODEBUILD_RESOLVED_SOURCE_VERSION:0:8}"
+      - container/build.sh --image_registry=public.ecr.aws --repository=u0z2s2z8 --label=hotfix-1.1.x-$SHORT_COMMIT_HASH --suffix=$CODEBUILD_BUILD_NUMBER match all
+  post_build:
+    commands:
+      - echo Build completed on `date`
+      - echo Pushing the Docker images to AWS public repository...
+      - docker push public.ecr.aws/u0z2s2z8/comanage-match:hotfix-1.1.x-$SHORT_COMMIT_HASH-basic-auth-$CODEBUILD_BUILD_NUMBER
+      - docker push public.ecr.aws/u0z2s2z8/comanage-match:hotfix-1.1.x-$SHORT_COMMIT_HASH-mod_auth_openidc-$CODEBUILD_BUILD_NUMBER
+      - docker push public.ecr.aws/u0z2s2z8/comanage-match:hotfix-1.1.x-$SHORT_COMMIT_HASH-shibboleth-sp-supervisor-$CODEBUILD_BUILD_NUMBER

container/match/base/comanage_shibboleth_sp_utils.sh

@@ -226,11 +226,11 @@ function comanage_shibboleth_sp_utils::process_slash_root() {
 
     pushd "${slash_root}"
 
-    # Copy all files and preserve all details but exclude any files
+    # Copy all files and sysmlinks and preserve all details but exclude any files
     # for the Shibboleth SP if they exist to allow the Shib SP
     # entrypoint script to process that path and prevent a race
     # condition.
-    find etc/shibboleth -type f | xargs -I{} cp --preserve=all --parents {} / > ${OUTPUT} 2>&1
+    find etc/shibboleth -type f,l | xargs -I{} cp --preserve=all --parents --no-dereference {} / > ${OUTPUT} 2>&1
 
     popd
 

container/match/base/comanage_utils.sh

@@ -656,11 +656,11 @@ function comanage_utils::process_slash_root() {
 
     pushd "${slash_root}"
 
-    # Copy all files and preserve all details but exclude any files
+    # Copy all files and symlinks and preserve all details but exclude any files
     # for the Shibboleth SP if they exist to allow the Shib SP
     # entrypoint script to process that path and prevent a race
     # condition.
-    find . -type f -not -path "./etc/shibboleth/*" | xargs -I{} cp --preserve=all --parents {} / > ${OUTPUT} 2>&1
+    find . -type f,l -not -path "./etc/shibboleth/*" | xargs -I{} cp --preserve=all --parents --no-dereference {} / > ${OUTPUT} 2>&1
 
     popd