Fix some issues to fit new framework

Fix some issues to fit new framework

Change-Id: I0bbf4127534c771427b89ec85a79e12249de33d1
Issue-ID:GSO-232
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
index d42d28c..593c6a3 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
@@ -95,7 +95,6 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
 \r
     .controller('homeCtrl', function($scope, $compile, $state, $log, DataService, NgTableParams) {\r
         $scope.param="lctableData";\r
-\r
         $scope.init = function() {\r
             jQuery.i18n.properties({\r
                 language : 'en-US',\r
@@ -224,7 +223,7 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
                   //  document.getElementById("svcTempl").innerHTML = templatesInfo;\r
                     $scope.optionsValue = tmplatesResponse;\r
                     var dropSimple_data = {\r
-                        "errmsg" : "Template version is required.",\r
+                        "errmsg" : "Service template is required.",\r
                         "modalVar" : "lifecycleData.optSelect",\r
                         "labelField" : "templateName",\r
                         "optionsValue" : JSON.stringify(tmplatesResponse),\r
@@ -240,7 +239,7 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
                \r
             //$('#myModal .creator').html($compile(Mustache.to_html(text, creatorText.ErrMsg))($scope));\r
 \r
-            var modelSubmit_data = {"title":"Submit", "clickAction":"saveData(lifecycleData.id)"};\r
+            var modelSubmit_data = {"title":"Submit", "clickAction":"saveData()"};\r
             var modelSubmit_html = Mustache.to_html(def_button_tpl, modelSubmit_data);\r
             $('#myModal #footerBtns').html($compile(modelSubmit_html)($scope));\r
 \r
@@ -318,8 +317,12 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
             \r
             var template = $scope.lifecycleData.optSelect;\r
             var lastSelTempCreateParam = DataService.getCreateParamJsonObj();\r
+            if(template == undefined){\r
+                document.getElementById("templateParameters").innerHTML = "";\r
+                return;\r
+            }            \r
             //if the template not changed, no need to update the page.\r
-            if(lastSelTempCreateParam.templateId == template.serviceTemplateId){\r
+            if(lastSelTempCreateParam.templateId == template.serviceTemplateId &&  document.getElementById("templateParameters").innerHTML != ""){\r
                 return;\r
             }\r
             $.when(DataService.generateCreateParameters(template))\r
@@ -338,16 +341,15 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
 \r
         $scope.showAddModal = function() {\r
             console.log("Showing Modal to Add data");\r
-            $scope.lifecycleData = {};\r
-            $scope.textboxErr = false;\r
-\r
+            //$scope.lifecycleData = {};\r
+            //$scope.textboxErr = false;\r
             //$("#myModal").modal();\r
             $("#myModal").modal({}).draggable();\r
         }\r
         $scope.closeModal = function() {\r
             console.log("Closing Modal...");\r
             $('#myModal').modal('hide');\r
-            $state.reload();\r
+            //$state.reload();\r
         }\r
 \r
         $scope.editData = function(id) {\r

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html
index 97b7e0c..c2e4917 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html
@@ -25,7 +25,7 @@
     <br>
     <div class="panel panel-default">
     <table ng-table="tableParams" class="table table table-striped table-hover table-bordered lctable" show-filter="true">
-        <tr ng-repeat="lcData in $data" ui-sref=".lcTabs({id: lcData.serviceId})" ui-sref-active="selected-row" ui-sref-opts="{reload: true}"><!--target="_self" ng-click="setClickedRow($index, lcData.id)" -->
+        <tr ng-repeat="lcData in $data" ui-sref=".lcTabs({id: lcData.serviceId})" ui-sref-active="selected-row" ui-sref-opts="{reload: false}"><!--target="_self" ng-click="setClickedRow($index, lcData.id)" -->
             <td header="'ng-table/headers/checkbox.html'">
                 <input type="checkbox" ng-model="checkboxes.items[lcData.serviceId]" />
             </td>