diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2018-02-12 01:57:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-12 01:57:11 +0000 |
| commit | 6eebbd311a6b2640106cdf05e0952f0c458161f9 (patch) | |
| tree | 32b8ef75b74490017eaca90af54bbca2130fec1e /testapi/opnfv_testapi/ui/components | |
| parent | 10153a988618ebeebf8a54d16ddf9281baf85d8d (diff) | |
| parent | 1fe11fb48972ce30b21a4423244642f0ed391b0c (diff) | |
Merge "Add multiple customs in scenario page"
Diffstat (limited to 'testapi/opnfv_testapi/ui/components')
| -rw-r--r-- | testapi/opnfv_testapi/ui/components/scenarios/modals/customModal.html | 30 | ||||
| -rw-r--r-- | testapi/opnfv_testapi/ui/components/scenarios/scenario/scenarioController.js | 23 |
2 files changed, 46 insertions, 7 deletions
diff --git a/testapi/opnfv_testapi/ui/components/scenarios/modals/customModal.html b/testapi/opnfv_testapi/ui/components/scenarios/modals/customModal.html index 987cb1e..90e4544 100644 --- a/testapi/opnfv_testapi/ui/components/scenarios/modals/customModal.html +++ b/testapi/opnfv_testapi/ui/components/scenarios/modals/customModal.html @@ -6,11 +6,31 @@ <legend>{{customModalCtrl.data.text}}</legend> <div class="row"> <div class="update-project"> - <label for="cpid" class="control-label col-sm-4">Custom: </label> - <div class="col-sm-6"> - <input type="text" class="form-control" ng-model="customModalCtrl.custom"/> - <p class="help-block"></p> - </div> + <label for="cpid" class="control-label col-sm-4">Custom: </label> + <table cellpadding="0" cellspacing="0"> + <tbody ng-repeat="custom in customModalCtrl.customs"> + <tr> + <td> + <div class="col-sm-12"> + <input type="text" class="form-control" value="{{custom}}" disabled/> + <p class="help-block"></p> + </div> + </td> + <td><input type="button" class="btn btn-danger" ng-click="customModalCtrl.remove($index)" value="Remove" /></td> + </tr> + </tbody> + <tfoot> + <tr> + <td> + <div class="col-sm-12"> + <input type="text" class="form-control" ng-model="customModalCtrl.custom"/> + <p class="help-block"></p> + </div> + </td> + <td><input type="button" class="btn btn-primary" ng-click="customModalCtrl.add()" value="Add" /></td> + </tr> + </tfoot> + </table> </div> </div> </div> diff --git a/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenarioController.js b/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenarioController.js index 53eb13a..b76f63c 100644 --- a/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenarioController.js +++ b/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenarioController.js @@ -435,15 +435,34 @@ ctrl.cancel = cancel; ctrl.data = angular.copy(data); ctrl.open = open; + ctrl.add = add; + ctrl.remove = remove; + ctrl.customs = []; + + function add() { + var custom = ctrl.custom; + if(custom!="" && custom!=undefined ){ + ctrl.customs.push(custom); + ctrl.custom = ""; + } + }; + + function remove(index) { + // var name = ctrl.customs[index].Name; + ctrl.customs.splice(index, 1); + + } /** * Initiate confirmation and call the success handler with the * inputs. */ function confirm() { - ctrl.customs = [] - ctrl.customs.push(ctrl.custom) + var custom = ctrl.custom; + if(custom!="" && custom!=undefined ){ + ctrl.customs.push(custom); + } ctrl.data.successHandler(ctrl.customs,ctrl.data.project,ctrl.data.version,ctrl.data.installer); $uibModalInstance.dismiss('cancel'); |