Merge hotfix-1.0.x into develop

skoranda · Sep 18, 2022 · c791de4 · c791de4
2 parents 133d841 + 55b7752
commit c791de4
Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/app/resources/locales/en_US/default.po b/app/resources/locales/en_US/default.po
@@ -43,7 +43,7 @@ msgid "match.meta.powered"
 msgstr "Powered By"
 
 msgid "match.meta.version"
-msgstr "Version {0}"
+msgstr "COmanage Match v{0}"
 
 ### Banners
 msgid "match.banner.api_users.matchgrid"

diff --git a/app/src/Lib/Match/ResultManager.php b/app/src/Lib/Match/ResultManager.php
@@ -137,8 +137,8 @@ protected function filterMetadata($parsed, $referenceId=null) {
         case 'request_time':
         case 'resolution_time':
           // Timestamps, format and inflect name
-          $ret['meta'][\Cake\Utility\Inflector::variable($attr)] = strftime("%FT%TZ",
-                                                                            strtotime($parsed[$attr]));
+          $ret['meta'][\Cake\Utility\Inflector::variable($attr)] = date("Y-m-d\TH:i:s\Z",
+                                                                        strtotime($parsed[$attr]));
           break;
         case 'sor':
           $ret['meta']['sorLabel'] = $parsed[$attr];

diff --git a/app/src/Model/Table/ApiUsersTable.php b/app/src/Model/Table/ApiUsersTable.php
@@ -70,7 +70,8 @@ public function initialize(array $config): void {
       'systemsOfRecord' => [
         'type'  => 'select',
         'model' => 'SystemsOfRecord',
-        'find'  => 'filterPrimaryLink'
+        'find'  => 'filterPrimaryLink',
+        'order' => ['label' => 'ASC']
       ]
     ]);
   }

diff --git a/app/src/View/Helper/FieldHelper.php b/app/src/View/Helper/FieldHelper.php
@@ -34,7 +34,7 @@
 use \Cake\View\Helper;
 
 class FieldHelper extends Helper {
-  public $helpers = ['Form'];
+  public $helpers = ['Form', 'Time'];
 
   // Is this read-only or read-write?
   protected $editable = true;
@@ -65,6 +65,7 @@ public function control(string $fieldName,
                           array  $childControls=[]) {
     $coptions = $options;
     $coptions['label'] = false;
+    $isRequired = $required; // We might override this below
 
     $label = null;
     $desc = null;
@@ -142,12 +143,12 @@ public function control(string $fieldName,
           ' . ($this->editable 
                ? $this->Form->label($fieldName, $label)
                : $label) 
-          . ($required ? ' <span class="required">*</span>' : '') . '
+          . ($isRequired ? ' <span class="required">*</span>' : '') . '
         </div>
         ' . ($desc ? '<span class="field-desc">' . $desc . '</span>' : "") .'
       </div>
       <div class="field-info">
-        ' . $this->Form->control($fieldName, $coptions) . '
+        ' . $control . '
         ' . $children . '
       </div>
     </li>

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)

diff --git a/app/templates/MatchgridRecords/fields.inc b/app/templates/MatchgridRecords/fields.inc
@@ -51,4 +51,10 @@ if($action == 'add' || $action == 'edit') {
   }
 
   print $this->Field->control('referenceid', [], false, __('match.fd.referenceid', [1]));
+}
+
+if($action == 'edit') {
+  print $this->Field->control('request_time');
+  // Force resolution to read only since it might not be populated
+  print $this->Field->control('resolution_time', ['readonly' => true]);
 }
diff --git a/app/templates/Matchgrids/configure.php b/app/templates/Matchgrids/configure.php
@@ -33,6 +33,8 @@
   </div>
 </div>
 
+<?= __('match.meta.version', [chop(file_get_contents(CONFIG . DS . "VERSION"))]); ?>
+
 <section class="inner-content">
   <!-- Matchgrid Configuration -->
   <?php

diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
@@ -116,7 +116,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>';