|
 |
e0d192 |
From 6d535b39fca585b9db2e314f75dc1bcb41ba2480 Mon Sep 17 00:00:00 2001
|
|
|
e0d192 |
From: Alexander Scheel <ascheel@redhat.com>
|
|
|
e0d192 |
Date: Mon, 22 Feb 2021 12:09:02 -0500
|
|
|
e0d192 |
Subject: [PATCH] Fix regression in TPS System menu
|
|
|
e0d192 |
|
|
|
e0d192 |
When backporting 1dbb07f8e41b4809b0f41a7643c37301fcf712d8 from PKI
|
|
|
e0d192 |
10.9+, there was a hidden dependency on
|
|
|
e0d192 |
c8f4fbc561b89603bc651395d3f995d6d4cac9b4, where the TPS variable was
|
|
|
e0d192 |
renamed from lowercase tps. In pulling the patch, this variable was
|
|
|
e0d192 |
renamed to uppercase TPS, breaking usages of lowercase tps in index.js.
|
|
|
e0d192 |
|
|
|
e0d192 |
Best to use lowercase and avoid pulling in c8f4fbc -- which in turn
|
|
|
e0d192 |
depends on other commits (such as
|
|
|
e0d192 |
f85f8e9d2fc16436757b26b7d10130435c36455b).
|
|
|
e0d192 |
|
|
|
e0d192 |
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
|
|
|
e0d192 |
(cherry picked from commit abc9e127a4704382d6069e7be8726e2c4436e821)
|
|
|
e0d192 |
---
|
|
|
e0d192 |
base/tps/shared/webapps/tps/js/tps.js | 6 +++---
|
|
|
e0d192 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
e0d192 |
|
|
|
e0d192 |
diff --git a/base/tps/shared/webapps/tps/js/tps.js b/base/tps/shared/webapps/tps/js/tps.js
|
|
|
e0d192 |
index f12f7b4..61007fd 100644
|
|
|
e0d192 |
--- a/base/tps/shared/webapps/tps/js/tps.js
|
|
|
e0d192 |
+++ b/base/tps/shared/webapps/tps/js/tps.js
|
|
|
e0d192 |
@@ -19,7 +19,7 @@
|
|
|
e0d192 |
* @author Endi S. Dewata
|
|
|
e0d192 |
*/
|
|
|
e0d192 |
|
|
|
e0d192 |
-var TPS = {
|
|
|
e0d192 |
+var tps = {
|
|
|
e0d192 |
PROFILE_ID_PATTERN: /^[a-zA-Z0-9_]+$/,
|
|
|
e0d192 |
PROPERTY_NAME_PATTERN: /^[a-zA-Z0-9_\.]+$/,
|
|
|
e0d192 |
getElementName: function (component) {
|
|
|
e0d192 |
@@ -133,7 +133,7 @@ var PropertiesTable = Table.extend({
|
|
|
e0d192 |
addEntry: function(entry) {
|
|
|
e0d192 |
var self = this;
|
|
|
e0d192 |
|
|
|
e0d192 |
- if (!entry.name.match(TPS.PROPERTY_NAME_PATTERN)) {
|
|
|
e0d192 |
+ if (!entry.name.match(tps.PROPERTY_NAME_PATTERN)) {
|
|
|
e0d192 |
throw "Invalid property name: " + entry.name;
|
|
|
e0d192 |
}
|
|
|
e0d192 |
|
|
|
e0d192 |
@@ -432,7 +432,7 @@ var ConfigEntryPage = EntryPage.extend({
|
|
|
e0d192 |
save: function() {
|
|
|
e0d192 |
var self = this;
|
|
|
e0d192 |
|
|
|
e0d192 |
- if (!self.entry.profileID.match(TPS.PROFILE_ID_PATTERN)) {
|
|
|
e0d192 |
+ if (!self.entry.profileID.match(tps.PROFILE_ID_PATTERN)) {
|
|
|
e0d192 |
throw "Invalid profile ID: " + self.entry.profileID;
|
|
|
e0d192 |
}
|
|
|
e0d192 |
|
|
|
e0d192 |
--
|
|
|
e0d192 |
1.8.3.1
|
|
|
e0d192 |
|