- ' . ($this->editable
+ ' . ($this->editable && !($fieldType == 'boolean')
? $this->Form->label($fieldName, $label)
: $label)
. ($isRequired ? '
*' : '') . '
diff --git a/app/templates/Attributes/fields.inc b/app/templates/Attributes/fields.inc
index e412c5c62..9fb5c8f3f 100644
--- a/app/templates/Attributes/fields.inc
+++ b/app/templates/Attributes/fields.inc
@@ -37,8 +37,6 @@ if($action == 'add' || $action == 'edit') {
print $this->Field->control('alphanumeric', [], false);
print $this->Field->control('case_sensitive', [], false);
-// CO-1762
-// print $this->Field->control('invalidates', [], false);
print $this->Field->control('null_equivalents', [], false);
print $this->Field->control('search_distance', [], false);
diff --git a/app/templates/Matchgrids/reconcile.php b/app/templates/Matchgrids/reconcile.php
index 98672707e..03f09913f 100644
--- a/app/templates/Matchgrids/reconcile.php
+++ b/app/templates/Matchgrids/reconcile.php
@@ -58,7 +58,6 @@
// String: attribute field name | Array of arrays: [attribute value, candidate id, different?1:0]
$canAttr = array();
for($i = 0; $i < count($fieldNames); $i++) {
-
// Put the field name in the first column.
$canAttr[$i][0] = $fieldNames[$i];
@@ -68,7 +67,7 @@
foreach($c as $key => $val) {
if($key == $fieldNames[$i]) {
$id = $c['id'];
- $diff = in_array($key,$vv_candidate_diff[$id]) ? 1 : 0;
+ $diff = (isset($vv_candidate_diff[$id]) && in_array($key,$vv_candidate_diff[$id])) ? 1 : 0;
$canAttr[$i][1][] = [$val, $id, $diff];
}
}
diff --git a/app/templates/SystemsOfRecord/columns.inc b/app/templates/SystemsOfRecord/columns.inc
index ae9da8f7e..edc9a7119 100644
--- a/app/templates/SystemsOfRecord/columns.inc
+++ b/app/templates/SystemsOfRecord/columns.inc
@@ -33,5 +33,9 @@ $indexColumns = [
'resolution_mode' => [
'type' => 'enum',
'class' => 'ResolutionModeEnum'
+ ],
+ 'trust_mode' => [
+ 'type' => 'enum',
+ 'class' => 'TrustModeEnum'
]
];
\ No newline at end of file
diff --git a/app/templates/SystemsOfRecord/fields.inc b/app/templates/SystemsOfRecord/fields.inc
index 56e2684b2..202e41c38 100644
--- a/app/templates/SystemsOfRecord/fields.inc
+++ b/app/templates/SystemsOfRecord/fields.inc
@@ -26,6 +26,7 @@
*/
use \App\Lib\Enum\ResolutionModeEnum;
+use \App\Lib\Enum\TrustModeEnum;
?>
',
+ '',
$row->id,
$url,
- Router::url($this->getToolbarUrl())
+ Router::url($this->getToolbarUrl()),
+ $nonce
);
$contents = substr($contents, 0, $pos) . $script . substr($contents, $pos);
$body->rewind();
diff --git a/app/vendor/cakephp/debug_kit/src/View/AjaxView.php b/app/vendor/cakephp/debug_kit/src/View/AjaxView.php
index 911a0b6f2..c2844efdc 100644
--- a/app/vendor/cakephp/debug_kit/src/View/AjaxView.php
+++ b/app/vendor/cakephp/debug_kit/src/View/AjaxView.php
@@ -2,17 +2,17 @@
declare(strict_types=1);
/**
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
*
* Licensed under The MIT License
* For full copyright and license information, please see the LICENSE.txt
* Redistributions of files must retain the above copyright notice.
*
- * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link http://cakephp.org CakePHP(tm) Project
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link https://cakephp.org CakePHP(tm) Project
* @since 3.2.8
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license https://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace DebugKit\View;
diff --git a/app/vendor/cakephp/debug_kit/src/View/Helper/CredentialsHelper.php b/app/vendor/cakephp/debug_kit/src/View/Helper/CredentialsHelper.php
index 253fabd85..86b017cc9 100644
--- a/app/vendor/cakephp/debug_kit/src/View/Helper/CredentialsHelper.php
+++ b/app/vendor/cakephp/debug_kit/src/View/Helper/CredentialsHelper.php
@@ -2,16 +2,16 @@
declare(strict_types=1);
/**
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link http://cakephp.org CakePHP(tm) Project
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link https://cakephp.org CakePHP(tm) Project
* @since 3.3.7
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license https://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace DebugKit\View\Helper;
@@ -39,7 +39,7 @@ class CredentialsHelper extends Helper
* Replace credentials in url's by *****
* Example mysql://username:password@localhost/my_db -> mysql://******@localhost/my_db
*
- * @param string $in variable to filter
+ * @param mixed $in variable to filter
* @return string
*/
public function filter($in)
diff --git a/app/vendor/cakephp/debug_kit/src/View/Helper/SimpleGraphHelper.php b/app/vendor/cakephp/debug_kit/src/View/Helper/SimpleGraphHelper.php
index 340ad1cda..3a06bd005 100644
--- a/app/vendor/cakephp/debug_kit/src/View/Helper/SimpleGraphHelper.php
+++ b/app/vendor/cakephp/debug_kit/src/View/Helper/SimpleGraphHelper.php
@@ -2,16 +2,16 @@
declare(strict_types=1);
/**
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link http://cakephp.org CakePHP(tm) Project
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link https://cakephp.org CakePHP(tm) Project
* @since 1.0.0
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license https://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace DebugKit\View\Helper;
@@ -70,10 +70,10 @@ public function bar($value, $offset, $options = [])
}
return sprintf(
- '
',
+ '
',
"width: {$width}px",
"margin-left: {$graphOffset}px; width: {$graphValue}px",
- __d('debug_kit', 'Starting {0}ms into the request, taking {1}ms', $offset, $value)
+ "Starting {$offset}ms into the request, taking {$value}ms"
);
}
}
diff --git a/app/vendor/cakephp/debug_kit/src/View/Helper/ToolbarHelper.php b/app/vendor/cakephp/debug_kit/src/View/Helper/ToolbarHelper.php
index d59a8e12e..0574ec143 100644
--- a/app/vendor/cakephp/debug_kit/src/View/Helper/ToolbarHelper.php
+++ b/app/vendor/cakephp/debug_kit/src/View/Helper/ToolbarHelper.php
@@ -2,28 +2,25 @@
declare(strict_types=1);
/**
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link http://cakephp.org CakePHP(tm) Project
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link https://cakephp.org CakePHP(tm) Project
* @since 0.1
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license https://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace DebugKit\View\Helper;
-use ArrayAccess;
use Cake\Error\Debug\ArrayItemNode;
use Cake\Error\Debug\ArrayNode;
use Cake\Error\Debug\HtmlFormatter;
use Cake\Error\Debug\ScalarNode;
use Cake\Error\Debugger;
use Cake\View\Helper;
-use Closure;
-use Iterator;
/**
* Provides Base methods for content specific debug toolbar helpers.
@@ -119,101 +116,4 @@ public function dump($value)
'
',
]);
}
-
- /**
- * Recursively goes through an array and makes neat HTML out of it.
- *
- * @param mixed $values Array to make pretty.
- * @param int $openDepth Depth to add open class
- * @param int $currentDepth current depth.
- * @param bool $doubleEncode Whether or not to double encode.
- * @param \SplObjectStorage $currentAncestors Object references found down
- * the path.
- * @return string
- * @deprecated 4.4.0 Use ToolbarHelper::dump() instead.
- */
- public function makeNeatArray(
- $values,
- $openDepth = 0,
- $currentDepth = 0,
- $doubleEncode = false,
- ?\SplObjectStorage $currentAncestors = null
- ) {
- if ($currentAncestors === null) {
- $ancestors = new \SplObjectStorage();
- } elseif (is_object($values)) {
- $ancestors = new \SplObjectStorage();
- $ancestors->addAll($currentAncestors);
- $ancestors->attach($values);
- } else {
- $ancestors = $currentAncestors;
- }
- $className = "neat-array depth-$currentDepth";
- if ($openDepth > $currentDepth) {
- $className .= ' expanded';
- }
- $nextDepth = $currentDepth + 1;
- $out = "
';
-
- return $out;
- }
}
diff --git a/app/vendor/cakephp/debug_kit/templates/Dashboard/index.php b/app/vendor/cakephp/debug_kit/templates/Dashboard/index.php
index ee3566fd5..d7468e1f2 100644
--- a/app/vendor/cakephp/debug_kit/templates/Dashboard/index.php
+++ b/app/vendor/cakephp/debug_kit/templates/Dashboard/index.php
@@ -3,18 +3,18 @@
* @var \App\View\AppView $this
*/
?>
-
Form->postLink(
- __d('debug_kit', 'Reset database'),
+ 'Reset database',
['_method' => 'POST', 'action' => 'reset'],
['confirm' => 'Are you sure?']
); ?>
@@ -22,5 +22,5 @@
diff --git a/app/vendor/cakephp/debug_kit/templates/MailPreview/email.php b/app/vendor/cakephp/debug_kit/templates/MailPreview/email.php
index 622089681..2529d93e1 100644
--- a/app/vendor/cakephp/debug_kit/templates/MailPreview/email.php
+++ b/app/vendor/cakephp/debug_kit/templates/MailPreview/email.php
@@ -1,4 +1,4 @@
-
@@ -60,7 +81,7 @@ final class HtmlResultPrinter extends ResultPrinter
*/
private const CLASS_HEADER = <<<'EOT'
-