• R/O
  • HTTP
  • SSH
  • HTTPS

zephyr: Commit

This repository is for zephyr, which is implemented for a GUI of Eos.


Commit MetaInfo

Revision75d7d2efaa3ad62372321e270dee622056f943be (tree)
Time2016-02-08 17:05:13
Authorhimetani_cafe <fumifumi@yasu...>
Commiterhimetani_cafe

Log Message

[Develop and Manual test] /api/v1/tagList

Changes to be committed:

modified: front-end/app/scripts/controllers/Execution.ts
modified: front-end/app/scripts/controllers/SelectCommand.ts
modified: front-end/app/scripts/services/APIEndPoint.ts
modified: front-end/app/scripts/services/MyModal.ts
modified: front-end/app/templates/select-command.html
modified: front-end/dist/bundle.js
modified: front-end/dist/templates/select-command.html
modified: server/api/tagList/index.js
new file: server/api/v1/tagList/index.js
modified: server/routes.js

Change Summary

Incremental Difference

--- a/front-end/app/scripts/controllers/Execution.ts
+++ b/front-end/app/scripts/controllers/Execution.ts
@@ -16,8 +16,8 @@ namespace app.controllers {
1616 this.$scope.$broadcast('close');
1717
1818 // add <command> directive
19- //this.MyModal.selectCommand();
20- this.commandInfoList.push(new declares.CommandInfo('mrcImageNoiseAdd'));
19+ this.MyModal.selectCommand();
20+ //this.commandInfoList.push(new declares.CommandInfo('mrcImageNoiseAdd'));
2121 }
2222
2323 public open() {
--- a/front-end/app/scripts/controllers/SelectCommand.ts
+++ b/front-end/app/scripts/controllers/SelectCommand.ts
@@ -1,11 +1,16 @@
11 namespace app.controllers {
22 export class SelectCommand{
33
4- public page = "History";
5-
64 public static $inject = ['$scope', 'APIEndPoint'];
5+ private tags: string[];
76
8- constructor($scope: ng.IScope, private APIEndPOint: services.APIEndPoint) {
7+ constructor($scope: ng.IScope, private APIEndPoint: services.APIEndPoint) {
8+ var controller = this;
9+ this.APIEndPoint
10+ .getTags()
11+ .$promise.then((result) => {
12+ controller.tags = result.info;
13+ });
914
1015 }
1116 }
--- a/front-end/app/scripts/services/APIEndPoint.ts
+++ b/front-end/app/scripts/services/APIEndPoint.ts
@@ -47,6 +47,11 @@ namespace app.services {
4747 return this.resource(endPoint,{}).get();
4848 }
4949
50+ public getTags(): ng.resource.IResource<declares.IResponse> {
51+ var endPoint = '/api/v1/tagList';
52+ return this.resource(endPoint, {}).get();
53+ }
54+
5055 public execute(data: any): ng.IHttpPromise<{}> {
5156 var endPoint = '/api/v1/execution';
5257 var fd = new FormData()
--- a/front-end/app/scripts/services/MyModal.ts
+++ b/front-end/app/scripts/services/MyModal.ts
@@ -29,6 +29,7 @@ namespace app.services {
2929 public selectCommand(): ng.ui.bootstrap.IModalServiceInstance {
3030 this.modalOption.templateUrl = 'templates/select-command.html';
3131 this.modalOption.controller = 'selectCommandController';
32+ this.modalOption.controllerAs = 'c';
3233 this.modalOption.size = 'lg';
3334 return this.$uibModal.open(this.modalOption);
3435 }
--- a/front-end/app/templates/select-command.html
+++ b/front-end/app/templates/select-command.html
@@ -5,6 +5,8 @@
55 <div class="modal-body">
66 <div class="row">
77 <div class="col-md-8">
8+ <p ng-repeat="tag in c.tags">{{tag}}</p>
9+ <!--
810 <div class="btn-group"ng-repeat="tag in tags">
911 <button type="button" class="btn btn-default btn-xs" ng-click="changeTag(tag)"><span class="glyphicon glyphicon-tag"></span>{{tag}}</button>
1012 </div>
@@ -18,14 +20,15 @@
1820 </button>
1921 </span>
2022 </div>
23+ -->
2124 </div>
2225 </div>
2326 </div>
2427
2528 <div class="modal-footer">
2629 <div class="row">
27- <!--<div ng-repeat="command in commands | filter:searchText |tagFilter:tag">-->
28- <!-- <div ng-repeat="command in commands | filter:searchText | tagFilter:tag"> -->
30+ <!--
31+ <div ng-repeat="command in commands | filter:searchText | tagFilter:tag">
2932 <div ng-repeat="command in commands | filter:searchText">
3033 <div class="col-md-6">
3134 <a class="pull-left" ng-click="selectCommand(command.name)" ng-if="$even">{{command.name}}</a>
@@ -34,5 +37,6 @@
3437 <a class="pull-left" ng-click="selectCommand(command.name)" ng-if="$odd">{{command.name}}</a>
3538 </div>
3639 </div>
40+ -->
3741 </div>
3842 </div>
--- a/front-end/dist/bundle.js
+++ b/front-end/dist/bundle.js
@@ -41047,6 +41047,10 @@
4104741047 var endPoint = '/api/v1/all/workspace/directory';
4104841048 return this.resource(endPoint, {}).get();
4104941049 };
41050+ APIEndPoint.prototype.getTags = function () {
41051+ var endPoint = '/api/v1/tagList';
41052+ return this.resource(endPoint, {}).get();
41053+ };
4105041054 APIEndPoint.prototype.execute = function (data) {
4105141055 var endPoint = '/api/v1/execution';
4105241056 var fd = new FormData();
@@ -41085,6 +41089,7 @@
4108541089 MyModal.prototype.selectCommand = function () {
4108641090 this.modalOption.templateUrl = 'templates/select-command.html';
4108741091 this.modalOption.controller = 'selectCommandController';
41092+ this.modalOption.controllerAs = 'c';
4108841093 this.modalOption.size = 'lg';
4108941094 return this.$uibModal.open(this.modalOption);
4109041095 };
@@ -41348,7 +41353,7 @@
4134841353 ;
4134941354 Execution.prototype.add = function () {
4135041355 this.$scope.$broadcast('close');
41351- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
41356+ this.MyModal.selectCommand();
4135241357 };
4135341358 Execution.prototype.open = function () {
4135441359 var result = this.MyModal.open('SelectCommand');
@@ -41416,9 +41421,14 @@
4141641421 var controllers;
4141741422 (function (controllers) {
4141841423 var SelectCommand = (function () {
41419- function SelectCommand($scope, APIEndPOint) {
41420- this.APIEndPOint = APIEndPOint;
41421- this.page = "History";
41424+ function SelectCommand($scope, APIEndPoint) {
41425+ this.APIEndPoint = APIEndPoint;
41426+ var controller = this;
41427+ this.APIEndPoint
41428+ .getTags()
41429+ .$promise.then(function (result) {
41430+ controller.tags = result.info;
41431+ });
4142241432 }
4142341433 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4142441434 return SelectCommand;
@@ -41525,6 +41535,10 @@
4152541535 var endPoint = '/api/v1/all/workspace/directory';
4152641536 return this.resource(endPoint, {}).get();
4152741537 };
41538+ APIEndPoint.prototype.getTags = function () {
41539+ var endPoint = '/api/v1/tagList';
41540+ return this.resource(endPoint, {}).get();
41541+ };
4152841542 APIEndPoint.prototype.execute = function (data) {
4152941543 var endPoint = '/api/v1/execution';
4153041544 var fd = new FormData();
@@ -41563,6 +41577,7 @@
4156341577 MyModal.prototype.selectCommand = function () {
4156441578 this.modalOption.templateUrl = 'templates/select-command.html';
4156541579 this.modalOption.controller = 'selectCommandController';
41580+ this.modalOption.controllerAs = 'c';
4156641581 this.modalOption.size = 'lg';
4156741582 return this.$uibModal.open(this.modalOption);
4156841583 };
@@ -41826,7 +41841,7 @@
4182641841 ;
4182741842 Execution.prototype.add = function () {
4182841843 this.$scope.$broadcast('close');
41829- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
41844+ this.MyModal.selectCommand();
4183041845 };
4183141846 Execution.prototype.open = function () {
4183241847 var result = this.MyModal.open('SelectCommand');
@@ -41894,9 +41909,14 @@
4189441909 var controllers;
4189541910 (function (controllers) {
4189641911 var SelectCommand = (function () {
41897- function SelectCommand($scope, APIEndPOint) {
41898- this.APIEndPOint = APIEndPOint;
41899- this.page = "History";
41912+ function SelectCommand($scope, APIEndPoint) {
41913+ this.APIEndPoint = APIEndPoint;
41914+ var controller = this;
41915+ this.APIEndPoint
41916+ .getTags()
41917+ .$promise.then(function (result) {
41918+ controller.tags = result.info;
41919+ });
4190041920 }
4190141921 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4190241922 return SelectCommand;
@@ -42003,6 +42023,10 @@
4200342023 var endPoint = '/api/v1/all/workspace/directory';
4200442024 return this.resource(endPoint, {}).get();
4200542025 };
42026+ APIEndPoint.prototype.getTags = function () {
42027+ var endPoint = '/api/v1/tagList';
42028+ return this.resource(endPoint, {}).get();
42029+ };
4200642030 APIEndPoint.prototype.execute = function (data) {
4200742031 var endPoint = '/api/v1/execution';
4200842032 var fd = new FormData();
@@ -42041,6 +42065,7 @@
4204142065 MyModal.prototype.selectCommand = function () {
4204242066 this.modalOption.templateUrl = 'templates/select-command.html';
4204342067 this.modalOption.controller = 'selectCommandController';
42068+ this.modalOption.controllerAs = 'c';
4204442069 this.modalOption.size = 'lg';
4204542070 return this.$uibModal.open(this.modalOption);
4204642071 };
@@ -42304,7 +42329,7 @@
4230442329 ;
4230542330 Execution.prototype.add = function () {
4230642331 this.$scope.$broadcast('close');
42307- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
42332+ this.MyModal.selectCommand();
4230842333 };
4230942334 Execution.prototype.open = function () {
4231042335 var result = this.MyModal.open('SelectCommand');
@@ -42372,9 +42397,14 @@
4237242397 var controllers;
4237342398 (function (controllers) {
4237442399 var SelectCommand = (function () {
42375- function SelectCommand($scope, APIEndPOint) {
42376- this.APIEndPOint = APIEndPOint;
42377- this.page = "History";
42400+ function SelectCommand($scope, APIEndPoint) {
42401+ this.APIEndPoint = APIEndPoint;
42402+ var controller = this;
42403+ this.APIEndPoint
42404+ .getTags()
42405+ .$promise.then(function (result) {
42406+ controller.tags = result.info;
42407+ });
4237842408 }
4237942409 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4238042410 return SelectCommand;
@@ -42481,6 +42511,10 @@
4248142511 var endPoint = '/api/v1/all/workspace/directory';
4248242512 return this.resource(endPoint, {}).get();
4248342513 };
42514+ APIEndPoint.prototype.getTags = function () {
42515+ var endPoint = '/api/v1/tagList';
42516+ return this.resource(endPoint, {}).get();
42517+ };
4248442518 APIEndPoint.prototype.execute = function (data) {
4248542519 var endPoint = '/api/v1/execution';
4248642520 var fd = new FormData();
@@ -42519,6 +42553,7 @@
4251942553 MyModal.prototype.selectCommand = function () {
4252042554 this.modalOption.templateUrl = 'templates/select-command.html';
4252142555 this.modalOption.controller = 'selectCommandController';
42556+ this.modalOption.controllerAs = 'c';
4252242557 this.modalOption.size = 'lg';
4252342558 return this.$uibModal.open(this.modalOption);
4252442559 };
@@ -42782,7 +42817,7 @@
4278242817 ;
4278342818 Execution.prototype.add = function () {
4278442819 this.$scope.$broadcast('close');
42785- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
42820+ this.MyModal.selectCommand();
4278642821 };
4278742822 Execution.prototype.open = function () {
4278842823 var result = this.MyModal.open('SelectCommand');
@@ -42850,9 +42885,14 @@
4285042885 var controllers;
4285142886 (function (controllers) {
4285242887 var SelectCommand = (function () {
42853- function SelectCommand($scope, APIEndPOint) {
42854- this.APIEndPOint = APIEndPOint;
42855- this.page = "History";
42888+ function SelectCommand($scope, APIEndPoint) {
42889+ this.APIEndPoint = APIEndPoint;
42890+ var controller = this;
42891+ this.APIEndPoint
42892+ .getTags()
42893+ .$promise.then(function (result) {
42894+ controller.tags = result.info;
42895+ });
4285642896 }
4285742897 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4285842898 return SelectCommand;
@@ -42959,6 +42999,10 @@
4295942999 var endPoint = '/api/v1/all/workspace/directory';
4296043000 return this.resource(endPoint, {}).get();
4296143001 };
43002+ APIEndPoint.prototype.getTags = function () {
43003+ var endPoint = '/api/v1/tagList';
43004+ return this.resource(endPoint, {}).get();
43005+ };
4296243006 APIEndPoint.prototype.execute = function (data) {
4296343007 var endPoint = '/api/v1/execution';
4296443008 var fd = new FormData();
@@ -42997,6 +43041,7 @@
4299743041 MyModal.prototype.selectCommand = function () {
4299843042 this.modalOption.templateUrl = 'templates/select-command.html';
4299943043 this.modalOption.controller = 'selectCommandController';
43044+ this.modalOption.controllerAs = 'c';
4300043045 this.modalOption.size = 'lg';
4300143046 return this.$uibModal.open(this.modalOption);
4300243047 };
@@ -43260,7 +43305,7 @@
4326043305 ;
4326143306 Execution.prototype.add = function () {
4326243307 this.$scope.$broadcast('close');
43263- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
43308+ this.MyModal.selectCommand();
4326443309 };
4326543310 Execution.prototype.open = function () {
4326643311 var result = this.MyModal.open('SelectCommand');
@@ -43328,9 +43373,14 @@
4332843373 var controllers;
4332943374 (function (controllers) {
4333043375 var SelectCommand = (function () {
43331- function SelectCommand($scope, APIEndPOint) {
43332- this.APIEndPOint = APIEndPOint;
43333- this.page = "History";
43376+ function SelectCommand($scope, APIEndPoint) {
43377+ this.APIEndPoint = APIEndPoint;
43378+ var controller = this;
43379+ this.APIEndPoint
43380+ .getTags()
43381+ .$promise.then(function (result) {
43382+ controller.tags = result.info;
43383+ });
4333443384 }
4333543385 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4333643386 return SelectCommand;
@@ -43437,6 +43487,10 @@
4343743487 var endPoint = '/api/v1/all/workspace/directory';
4343843488 return this.resource(endPoint, {}).get();
4343943489 };
43490+ APIEndPoint.prototype.getTags = function () {
43491+ var endPoint = '/api/v1/tagList';
43492+ return this.resource(endPoint, {}).get();
43493+ };
4344043494 APIEndPoint.prototype.execute = function (data) {
4344143495 var endPoint = '/api/v1/execution';
4344243496 var fd = new FormData();
@@ -43475,6 +43529,7 @@
4347543529 MyModal.prototype.selectCommand = function () {
4347643530 this.modalOption.templateUrl = 'templates/select-command.html';
4347743531 this.modalOption.controller = 'selectCommandController';
43532+ this.modalOption.controllerAs = 'c';
4347843533 this.modalOption.size = 'lg';
4347943534 return this.$uibModal.open(this.modalOption);
4348043535 };
@@ -43738,7 +43793,7 @@
4373843793 ;
4373943794 Execution.prototype.add = function () {
4374043795 this.$scope.$broadcast('close');
43741- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
43796+ this.MyModal.selectCommand();
4374243797 };
4374343798 Execution.prototype.open = function () {
4374443799 var result = this.MyModal.open('SelectCommand');
@@ -43806,9 +43861,14 @@
4380643861 var controllers;
4380743862 (function (controllers) {
4380843863 var SelectCommand = (function () {
43809- function SelectCommand($scope, APIEndPOint) {
43810- this.APIEndPOint = APIEndPOint;
43811- this.page = "History";
43864+ function SelectCommand($scope, APIEndPoint) {
43865+ this.APIEndPoint = APIEndPoint;
43866+ var controller = this;
43867+ this.APIEndPoint
43868+ .getTags()
43869+ .$promise.then(function (result) {
43870+ controller.tags = result.info;
43871+ });
4381243872 }
4381343873 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4381443874 return SelectCommand;
@@ -43915,6 +43975,10 @@
4391543975 var endPoint = '/api/v1/all/workspace/directory';
4391643976 return this.resource(endPoint, {}).get();
4391743977 };
43978+ APIEndPoint.prototype.getTags = function () {
43979+ var endPoint = '/api/v1/tagList';
43980+ return this.resource(endPoint, {}).get();
43981+ };
4391843982 APIEndPoint.prototype.execute = function (data) {
4391943983 var endPoint = '/api/v1/execution';
4392043984 var fd = new FormData();
@@ -43953,6 +44017,7 @@
4395344017 MyModal.prototype.selectCommand = function () {
4395444018 this.modalOption.templateUrl = 'templates/select-command.html';
4395544019 this.modalOption.controller = 'selectCommandController';
44020+ this.modalOption.controllerAs = 'c';
4395644021 this.modalOption.size = 'lg';
4395744022 return this.$uibModal.open(this.modalOption);
4395844023 };
@@ -44216,7 +44281,7 @@
4421644281 ;
4421744282 Execution.prototype.add = function () {
4421844283 this.$scope.$broadcast('close');
44219- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
44284+ this.MyModal.selectCommand();
4422044285 };
4422144286 Execution.prototype.open = function () {
4422244287 var result = this.MyModal.open('SelectCommand');
@@ -44284,9 +44349,14 @@
4428444349 var controllers;
4428544350 (function (controllers) {
4428644351 var SelectCommand = (function () {
44287- function SelectCommand($scope, APIEndPOint) {
44288- this.APIEndPOint = APIEndPOint;
44289- this.page = "History";
44352+ function SelectCommand($scope, APIEndPoint) {
44353+ this.APIEndPoint = APIEndPoint;
44354+ var controller = this;
44355+ this.APIEndPoint
44356+ .getTags()
44357+ .$promise.then(function (result) {
44358+ controller.tags = result.info;
44359+ });
4429044360 }
4429144361 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4429244362 return SelectCommand;
@@ -44393,6 +44463,10 @@
4439344463 var endPoint = '/api/v1/all/workspace/directory';
4439444464 return this.resource(endPoint, {}).get();
4439544465 };
44466+ APIEndPoint.prototype.getTags = function () {
44467+ var endPoint = '/api/v1/tagList';
44468+ return this.resource(endPoint, {}).get();
44469+ };
4439644470 APIEndPoint.prototype.execute = function (data) {
4439744471 var endPoint = '/api/v1/execution';
4439844472 var fd = new FormData();
@@ -44431,6 +44505,7 @@
4443144505 MyModal.prototype.selectCommand = function () {
4443244506 this.modalOption.templateUrl = 'templates/select-command.html';
4443344507 this.modalOption.controller = 'selectCommandController';
44508+ this.modalOption.controllerAs = 'c';
4443444509 this.modalOption.size = 'lg';
4443544510 return this.$uibModal.open(this.modalOption);
4443644511 };
@@ -44694,7 +44769,7 @@
4469444769 ;
4469544770 Execution.prototype.add = function () {
4469644771 this.$scope.$broadcast('close');
44697- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
44772+ this.MyModal.selectCommand();
4469844773 };
4469944774 Execution.prototype.open = function () {
4470044775 var result = this.MyModal.open('SelectCommand');
@@ -44762,9 +44837,14 @@
4476244837 var controllers;
4476344838 (function (controllers) {
4476444839 var SelectCommand = (function () {
44765- function SelectCommand($scope, APIEndPOint) {
44766- this.APIEndPOint = APIEndPOint;
44767- this.page = "History";
44840+ function SelectCommand($scope, APIEndPoint) {
44841+ this.APIEndPoint = APIEndPoint;
44842+ var controller = this;
44843+ this.APIEndPoint
44844+ .getTags()
44845+ .$promise.then(function (result) {
44846+ controller.tags = result.info;
44847+ });
4476844848 }
4476944849 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4477044850 return SelectCommand;
@@ -44871,6 +44951,10 @@
4487144951 var endPoint = '/api/v1/all/workspace/directory';
4487244952 return this.resource(endPoint, {}).get();
4487344953 };
44954+ APIEndPoint.prototype.getTags = function () {
44955+ var endPoint = '/api/v1/tagList';
44956+ return this.resource(endPoint, {}).get();
44957+ };
4487444958 APIEndPoint.prototype.execute = function (data) {
4487544959 var endPoint = '/api/v1/execution';
4487644960 var fd = new FormData();
@@ -44909,6 +44993,7 @@
4490944993 MyModal.prototype.selectCommand = function () {
4491044994 this.modalOption.templateUrl = 'templates/select-command.html';
4491144995 this.modalOption.controller = 'selectCommandController';
44996+ this.modalOption.controllerAs = 'c';
4491244997 this.modalOption.size = 'lg';
4491344998 return this.$uibModal.open(this.modalOption);
4491444999 };
@@ -45172,7 +45257,7 @@
4517245257 ;
4517345258 Execution.prototype.add = function () {
4517445259 this.$scope.$broadcast('close');
45175- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
45260+ this.MyModal.selectCommand();
4517645261 };
4517745262 Execution.prototype.open = function () {
4517845263 var result = this.MyModal.open('SelectCommand');
@@ -45240,9 +45325,14 @@
4524045325 var controllers;
4524145326 (function (controllers) {
4524245327 var SelectCommand = (function () {
45243- function SelectCommand($scope, APIEndPOint) {
45244- this.APIEndPOint = APIEndPOint;
45245- this.page = "History";
45328+ function SelectCommand($scope, APIEndPoint) {
45329+ this.APIEndPoint = APIEndPoint;
45330+ var controller = this;
45331+ this.APIEndPoint
45332+ .getTags()
45333+ .$promise.then(function (result) {
45334+ controller.tags = result.info;
45335+ });
4524645336 }
4524745337 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4524845338 return SelectCommand;
@@ -45349,6 +45439,10 @@
4534945439 var endPoint = '/api/v1/all/workspace/directory';
4535045440 return this.resource(endPoint, {}).get();
4535145441 };
45442+ APIEndPoint.prototype.getTags = function () {
45443+ var endPoint = '/api/v1/tagList';
45444+ return this.resource(endPoint, {}).get();
45445+ };
4535245446 APIEndPoint.prototype.execute = function (data) {
4535345447 var endPoint = '/api/v1/execution';
4535445448 var fd = new FormData();
@@ -45387,6 +45481,7 @@
4538745481 MyModal.prototype.selectCommand = function () {
4538845482 this.modalOption.templateUrl = 'templates/select-command.html';
4538945483 this.modalOption.controller = 'selectCommandController';
45484+ this.modalOption.controllerAs = 'c';
4539045485 this.modalOption.size = 'lg';
4539145486 return this.$uibModal.open(this.modalOption);
4539245487 };
@@ -45650,7 +45745,7 @@
4565045745 ;
4565145746 Execution.prototype.add = function () {
4565245747 this.$scope.$broadcast('close');
45653- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
45748+ this.MyModal.selectCommand();
4565445749 };
4565545750 Execution.prototype.open = function () {
4565645751 var result = this.MyModal.open('SelectCommand');
@@ -45718,9 +45813,14 @@
4571845813 var controllers;
4571945814 (function (controllers) {
4572045815 var SelectCommand = (function () {
45721- function SelectCommand($scope, APIEndPOint) {
45722- this.APIEndPOint = APIEndPOint;
45723- this.page = "History";
45816+ function SelectCommand($scope, APIEndPoint) {
45817+ this.APIEndPoint = APIEndPoint;
45818+ var controller = this;
45819+ this.APIEndPoint
45820+ .getTags()
45821+ .$promise.then(function (result) {
45822+ controller.tags = result.info;
45823+ });
4572445824 }
4572545825 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4572645826 return SelectCommand;
@@ -45827,6 +45927,10 @@
4582745927 var endPoint = '/api/v1/all/workspace/directory';
4582845928 return this.resource(endPoint, {}).get();
4582945929 };
45930+ APIEndPoint.prototype.getTags = function () {
45931+ var endPoint = '/api/v1/tagList';
45932+ return this.resource(endPoint, {}).get();
45933+ };
4583045934 APIEndPoint.prototype.execute = function (data) {
4583145935 var endPoint = '/api/v1/execution';
4583245936 var fd = new FormData();
@@ -45865,6 +45969,7 @@
4586545969 MyModal.prototype.selectCommand = function () {
4586645970 this.modalOption.templateUrl = 'templates/select-command.html';
4586745971 this.modalOption.controller = 'selectCommandController';
45972+ this.modalOption.controllerAs = 'c';
4586845973 this.modalOption.size = 'lg';
4586945974 return this.$uibModal.open(this.modalOption);
4587045975 };
@@ -46128,7 +46233,7 @@
4612846233 ;
4612946234 Execution.prototype.add = function () {
4613046235 this.$scope.$broadcast('close');
46131- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
46236+ this.MyModal.selectCommand();
4613246237 };
4613346238 Execution.prototype.open = function () {
4613446239 var result = this.MyModal.open('SelectCommand');
@@ -46196,9 +46301,14 @@
4619646301 var controllers;
4619746302 (function (controllers) {
4619846303 var SelectCommand = (function () {
46199- function SelectCommand($scope, APIEndPOint) {
46200- this.APIEndPOint = APIEndPOint;
46201- this.page = "History";
46304+ function SelectCommand($scope, APIEndPoint) {
46305+ this.APIEndPoint = APIEndPoint;
46306+ var controller = this;
46307+ this.APIEndPoint
46308+ .getTags()
46309+ .$promise.then(function (result) {
46310+ controller.tags = result.info;
46311+ });
4620246312 }
4620346313 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4620446314 return SelectCommand;
@@ -46305,6 +46415,10 @@
4630546415 var endPoint = '/api/v1/all/workspace/directory';
4630646416 return this.resource(endPoint, {}).get();
4630746417 };
46418+ APIEndPoint.prototype.getTags = function () {
46419+ var endPoint = '/api/v1/tagList';
46420+ return this.resource(endPoint, {}).get();
46421+ };
4630846422 APIEndPoint.prototype.execute = function (data) {
4630946423 var endPoint = '/api/v1/execution';
4631046424 var fd = new FormData();
@@ -46343,6 +46457,7 @@
4634346457 MyModal.prototype.selectCommand = function () {
4634446458 this.modalOption.templateUrl = 'templates/select-command.html';
4634546459 this.modalOption.controller = 'selectCommandController';
46460+ this.modalOption.controllerAs = 'c';
4634646461 this.modalOption.size = 'lg';
4634746462 return this.$uibModal.open(this.modalOption);
4634846463 };
@@ -46606,7 +46721,7 @@
4660646721 ;
4660746722 Execution.prototype.add = function () {
4660846723 this.$scope.$broadcast('close');
46609- this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
46724+ this.MyModal.selectCommand();
4661046725 };
4661146726 Execution.prototype.open = function () {
4661246727 var result = this.MyModal.open('SelectCommand');
@@ -46674,9 +46789,14 @@
4667446789 var controllers;
4667546790 (function (controllers) {
4667646791 var SelectCommand = (function () {
46677- function SelectCommand($scope, APIEndPOint) {
46678- this.APIEndPOint = APIEndPOint;
46679- this.page = "History";
46792+ function SelectCommand($scope, APIEndPoint) {
46793+ this.APIEndPoint = APIEndPoint;
46794+ var controller = this;
46795+ this.APIEndPoint
46796+ .getTags()
46797+ .$promise.then(function (result) {
46798+ controller.tags = result.info;
46799+ });
4668046800 }
4668146801 SelectCommand.$inject = ['$scope', 'APIEndPoint'];
4668246802 return SelectCommand;
--- a/front-end/dist/templates/select-command.html
+++ b/front-end/dist/templates/select-command.html
@@ -5,6 +5,8 @@
55 <div class="modal-body">
66 <div class="row">
77 <div class="col-md-8">
8+ <p ng-repeat="tag in c.tags">{{tag}}</p>
9+ <!--
810 <div class="btn-group"ng-repeat="tag in tags">
911 <button type="button" class="btn btn-default btn-xs" ng-click="changeTag(tag)"><span class="glyphicon glyphicon-tag"></span>{{tag}}</button>
1012 </div>
@@ -18,14 +20,15 @@
1820 </button>
1921 </span>
2022 </div>
23+ -->
2124 </div>
2225 </div>
2326 </div>
2427
2528 <div class="modal-footer">
2629 <div class="row">
27- <!--<div ng-repeat="command in commands | filter:searchText |tagFilter:tag">-->
28- <!-- <div ng-repeat="command in commands | filter:searchText | tagFilter:tag"> -->
30+ <!--
31+ <div ng-repeat="command in commands | filter:searchText | tagFilter:tag">
2932 <div ng-repeat="command in commands | filter:searchText">
3033 <div class="col-md-6">
3134 <a class="pull-left" ng-click="selectCommand(command.name)" ng-if="$even">{{command.name}}</a>
@@ -34,5 +37,6 @@
3437 <a class="pull-left" ng-click="selectCommand(command.name)" ng-if="$odd">{{command.name}}</a>
3538 </div>
3639 </div>
40+ -->
3741 </div>
3842 </div>
--- a/server/api/tagList/index.js
+++ b/server/api/tagList/index.js
@@ -5,7 +5,11 @@ var router = express.Router();
55
66 router.get('/', function(req, res) {
77 var tagList = require('../../../util/json/tag_list');
8- res.json(tagList);
8+ var info = {
9+ status: 'success',
10+ info: tagList
11+ };
12+ res.send(info);
913 });
1014
1115 module.exports = router;
--- /dev/null
+++ b/server/api/v1/tagList/index.js
@@ -0,0 +1,15 @@
1+'use strict';
2+
3+var express = require('express');
4+var router = express.Router();
5+
6+router.get('/', function(req, res) {
7+ var tagList = require(__dirname + '/../../../../user-specific-files/OptionControlFile/tag_list');
8+ var info = {
9+ status: 'success',
10+ info: tagList
11+ };
12+ res.send(info);
13+});
14+
15+module.exports = router;
--- a/server/routes.js
+++ b/server/routes.js
@@ -22,6 +22,7 @@ module.exports = function(app) {
2222 app.use('/api/v1/workspace/', require(__dirname + '/api/v1/workspace'));
2323 app.use('/api/v1/all/workspace/directory', require(__dirname + '/api/v1/all/workspace/directory'));
2424 app.use('/api/v1/optionControlFile', require(__dirname + '/api/v1/optionControlFile'));
25+ app.use('/api/v1/tagList', require(__dirname + '/api/v1/tagList'));
2526
2627 app.route('/*')
2728 .get(function(req, res) {
Show on old repository browser