You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gearpump.apache.org by ma...@apache.org on 2016/05/31 02:09:19 UTC

incubator-gearpump git commit: fix GERAPUMP-54, allow user to specify application name

Repository: incubator-gearpump
Updated Branches:
  refs/heads/master 9e251982a -> 7edaf4bd4


fix GERAPUMP-54, allow user to specify application name

Author: manuzhang <ow...@gmail.com>

Closes #28 from manuzhang/GEARPUMP-54.


Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/7edaf4bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/7edaf4bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/7edaf4bd

Branch: refs/heads/master
Commit: 7edaf4bd4529077506b6fa125fc375e3fae1ef5d
Parents: 9e25198
Author: manuzhang <ow...@gmail.com>
Authored: Tue May 31 10:09:14 2016 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Tue May 31 10:09:14 2016 +0800

----------------------------------------------------------------------
 services/dashboard/views/apps/compose/compose.html | 4 ++++
 services/dashboard/views/apps/compose/compose.js   | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/7edaf4bd/services/dashboard/views/apps/compose/compose.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/compose/compose.html b/services/dashboard/views/apps/compose/compose.html
index 58ce457..6163373 100644
--- a/services/dashboard/views/apps/compose/compose.html
+++ b/services/dashboard/views/apps/compose/compose.html
@@ -1,5 +1,9 @@
 <div class="col-md-3">
 
+  <h5>Application Name</h5>
+    <form name="form">
+      <input class="form-control" type="text" ng-model="appName" />
+    </form>
   <h5>Components</h5>
   <button type="button" class="btn btn-sm btn-default btn-primary btn-block"
           ng-click="chooseProcessor()">

http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/7edaf4bd/services/dashboard/views/apps/compose/compose.js
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/compose/compose.js b/services/dashboard/views/apps/compose/compose.js
index 8c70f32..92d8b27 100644
--- a/services/dashboard/views/apps/compose/compose.js
+++ b/services/dashboard/views/apps/compose/compose.js
@@ -40,6 +40,8 @@ angular.module('dashboard')
         controller: 'ComposeAppChooseEdgeCtrl'
       });
 
+      $scope.appName = "";
+
       $scope.chooseProcessor = function (processor) {
         var args = {
           processor: processor
@@ -155,6 +157,7 @@ angular.module('dashboard')
 
       $scope.canSubmit = function () {
         return !$scope.submitted &&
+          $scope.appName.length > 0 &&
           $scope.visGraph.data.nodes.length > 0 &&
           Object.keys($scope.files).length > 0;
       };
@@ -164,7 +167,7 @@ angular.module('dashboard')
         var processors = data.nodes.get();
         var edges = data.edges.get();
         var args = {
-          appName: 'userapp',
+          appName: $scope.appName,
           processors: processors.map(function (processor) {
             return [processor.id, {
               id: processor.id,