Skip to content

Commit 7f6de49

Browse files
committed
Fixes errors thrown for delayed Parameters and Application responses
Fixes #303
1 parent 9d80590 commit 7f6de49

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

designer/src/main/webapp/js/app/controllers/controllers.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,19 @@ App.controller('AppCtrl', function ($rootScope, $location, $scope, Idle, keepAli
8484
});
8585
});
8686

87-
App.controller('projectMenuCtrl', function ($rootScope, $scope, authentication, $location, $modal, $q, $http, $state, application, projectParameters, parametersService,project, designerService, $translate) {
87+
App.controller('projectMenuCtrl', function ($rootScope, $stateParams, $scope, authentication, $location, $modal, $q, $http, $state, application, projectParameters, parametersService,project, designerService, $translate) {
8888

89-
$scope.applicationSid = application.sid;
90-
$scope.applicationFriendlyName = application.friendly_name;
89+
$scope.applicationSid = $stateParams.applicationSid;
90+
$scope.application = application;
9191
$scope.projectKind = project.projectKind;
92-
if (projectParameters.parameters.length > 0) {
93-
$scope.showParametersButton = true;
94-
}
92+
$scope.parametersResponse = projectParameters;
93+
9594
$scope.showGraph = false;
96-
$scope.appStartUrl = designerService.getStartUrl(application.sid);
95+
$scope.appStartUrl = designerService.getStartUrl($stateParams.applicationSid);
9796
$scope.authInfo = authentication.getAuthInfo();
9897

9998
$scope.showParameters = function () {
100-
parametersService.showModal(application.sid);
99+
parametersService.showModal($stateParams.applicationSid);
101100
}
102101
$scope.startupNodeSet = function () {
103102
return designerService.startupNodeSet(project);

designer/src/main/webapp/templates/project-menu.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="dropdown project-menu pull-right">
2-
<button class="btn btn-link dropdown-toggle project-menu-button" title="{{applicationSid}}">{{applicationFriendlyName}} <b class="caret"></b></button>
2+
<button class="btn btn-link dropdown-toggle project-menu-button" title="{{applicationSid}}">{{application.friendly_name}} <b class="caret"></b></button>
33
<ul class="dropdown-menu project-dropdown-menu">
4-
<li ng-show="showParametersButton">
4+
<li ng-show="parametersResponse.parameters.length > 0">
55
<a href ng-click="showParameters()" class="muted">Parameters</a>
66
</li>
77
<li>

0 commit comments

Comments
 (0)