aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoruj426b <uj426b@att.com>2020-04-16 15:43:34 -0400
committeruj426b <uj426b@att.com>2020-04-16 16:02:29 -0400
commit1f35b78f96933ad3a0976d03863e4d23b544ee86 (patch)
treea6159c85cb9bd4af4e227e5bb79e3f07053acd90
parent128e3258acdf973a42e81adc75aeae3df7d46cb9 (diff)
Fix for blank onapName and partial dictionary
Issue-ID: POLICY-2492 Change-Id: I329f6ab38d68887139f1d198a6777917fbd0fb28 Signed-off-by: uj426b <uj426b@att.com>
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java2
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/onapNameDictGridController.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java
index e2e2e3872..2c0278ed5 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java
@@ -55,7 +55,7 @@ public class DictionaryController {
private static String operation = "operation";
private static String dictionaryFields = "dictionaryFields";
private static String duplicateResponseString = "Duplicate";
- private static String onapName = "onapName";
+ private static String onapName = "name";
private static String attributeDatas = "attributeDictionaryDatas";
private static String onapNameDatas = "onapNameDictionaryDatas";
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/onapNameDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/onapNameDictGridController.js
index 41f033330..6727a7a30 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/onapNameDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/onapNameDictGridController.js
@@ -58,7 +58,7 @@ app.controller('onapNameDictGridController', function ($scope, PolicyAppService,
'<button type="button" class="btn btn-primary" ng-click="grid.appScope.editOnapNameWindow(row.entity)"><i class="fa fa-pencil-square-o"></i></button> ' +
'<button type="button" class="btn btn-danger" ng-click="grid.appScope.deleteOnapName(row.entity)" ><i class="fa fa-trash-o"></i></button> ', width: '8%'
},
- { field: 'onapName', displayName : 'Onap Name', sort: { direction: 'asc', priority: 0 } },
+ { field: 'name', displayName : 'Onap Name', sort: { direction: 'asc', priority: 0 } },
{ field: 'description', width: '20%' },
{field: 'userCreatedBy.userName', displayName : 'Created By'},
{field: 'userModifiedBy.userName', displayName : 'Modified By' },