lee/caprover
1
0
Fork 0
mirror of https://github.com/caprover/caprover synced 2026-09-26 08:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:githubsaturn/captainduckduck

Browse Source
This commit is contained in:
Kasra Bigdeli
2017-12-06 22:50:58 -08:00
parent bc170f3b8b 6ef549d045
commit afd143d1d3
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app-backend/dist/js/dashboard.min.js
Vendored
+2 -1
View File
@@ -923,7 +923,7 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
volumes: app.volumes
}
apiManager.updateConfigAndSave(app.appName, appConfig, function (data) {
apiManager.updateConfigAndSave(app.appName, appDefinition, function (data) {
if (captainToast.showErrorToastIfNeeded(data)) {
$scope.loadingState.enabled = false;
@@ -939,6 +939,7 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
}())
}
angular.module('RDash')
.controller('DashboardController', ['$scope', '$cookieStore',
'$rootScope', 'pageDefinitions', 'apiManager', 'captainToast',
app-backend/dist/lib/js/main.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
app-backend/src/utils/CaptainConstants.js
+1 -1
View File
@@ -24,7 +24,7 @@ let data = {
isDebug: EnvVars.CAPTAIN_IS_DEBUG,
version: '0.2.1',
version: '0.2.2',
captainSaltSecretKey: 'captain-salt',
app-frontend/src/js/controllers/app-definitions-ctrl.js
+2 -2
View File
@@ -248,7 +248,7 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
volumes: app.volumes
}
apiManager.updateConfigAndSave(app.appName, appConfig, function (data) {
apiManager.updateConfigAndSave(app.appName, appDefinition, function (data) {
if (captainToast.showErrorToastIfNeeded(data)) {
$scope.loadingState.enabled = false;
@@ -263,4 +263,4 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
}())
}
}