diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-07-17 13:26:12 +0300 |
|---|---|---|
| committer | Ittay Stern <ittay.stern@att.com> | 2019-07-18 02:00:08 +0000 |
| commit | 97cffb810fcf3d3f02d814827f24adc090cf8e2e (patch) | |
| tree | fee8c342942a667f3128d1925649d6f83064427b /vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js | |
| parent | db98c7976e57f8bacbcc93b802b4d05b1db7b8cf (diff) | |
Merge from ecomp 3374149f - AngularJS UI
Issue-ID: VID-378
Change-Id: I6b3243b492009035c911f63b93258ea76938fcb9
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js')
| -rwxr-xr-x | vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js index 62ef1a4f2..9cb905038 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js @@ -64,7 +64,8 @@ $scope.currentPageNum=1;
$scope.isSpinnerVisible = false;
$scope.isProgressVisible = false;
- if (sessionStorage.getItem("searchKey")!='undefined' && ($scope.rememberFilter)) {
+ var searchKey = sessionStorage.getItem("searchKey");
+ if (searchKey != 'undefined' && searchKey!=null && ($scope.rememberFilter)) {
var searchKey = JSON.parse(sessionStorage.getItem("searchKey"));
$scope.searchString = searchKey.searchString || '';
$scope.viewPerPage = searchKey.viewPerPage || defaultViewPerPage;
@@ -206,7 +207,7 @@ DataService.setShouldIncludeInAsyncInstantiationFlow(shouldTakeTheAsyncInstantiationFlow);
DataService.setALaCarte (true);
- DataService.setPnf(!angular.equals(serviceModel.pnfs, {}));
+ DataService.setPnf(!angular.equals(serviceModel.pnfs, {}));
$scope.createType = COMPONENT.A_LA_CARTE;
var broadcastType = COMPONENT.CREATE_COMPONENT;
if (AsdcService.isMacro(serviceModel) || DataService.getE2EService()) {
|