jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Move all app configure tasks to separate view

Browse Source
This commit is contained in:
Johannes Zellner
2019-09-10 19:21:30 +02:00
parent 8823656d70
commit a4c99fd361
6 changed files with 897 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/js/client.js
View File

@@ -460,12 +460,12 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
});
};
Client.prototype.configureApp = function (id, data, callback) {
post('/api/v1/apps/' + id + '/configure', data, null, function (error, data, status) {
Client.prototype.configureApp = function (id, setting, data, callback) {
post('/api/v1/apps/' + id + '/configure/' + setting, data, null, function (error, data, status) {
if (error) return callback(error);
if (status !== 202) return callback(new ClientError(status, data));
if (status !== 200 && status !== 202) return callback(new ClientError(status, data));
callback(null);
callback(null, data);
});
};
@@ -1027,12 +1027,13 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
};
Client.prototype.getApp = function (appId, callback) {
var that = this;
get('/api/v1/apps/' + appId, null, function (error, data, status) {
if (error) return callback(error);
if (status !== 200) return callback(new ClientError(status, data));
var tmp = data.manifest.description.match(/\<upstream\>(.*)\<\/upstream\>/i);
data.upstreamVersion = (tmp && tmp[1]) ? tmp[1] : '';
that._appPostProcess(data);
callback(null, data);
});
@@ -1458,6 +1459,9 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
// amend the post install confirm state
app.pendingPostInstallConfirmation = !!localStorage['confirmPostInstall_' + app.id];
var tmp = app.manifest.description.match(/\<upstream\>(.*)\<\/upstream\>/i);
app.upstreamVersion = (tmp && tmp[1]) ? tmp[1] : '';
return app;
};