Fix for blank onapName and partial dictionary

Issue-ID: POLICY-2492
Change-Id: I329f6ab38d68887139f1d198a6777917fbd0fb28
Signed-off-by: uj426b <uj426b@att.com>

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 e2e2e38..2c0278e 100644 (file)
--- 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 41f0333..6727a7a 100644 (file)
--- 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' },