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

Show non published apps in webadmin

Browse Source
This commit is contained in:
Johannes Zellner
2015-07-27 16:28:07 +02:00
parent 87c76a3eb3
commit c4bb56dc95
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webadmin/src/js/client.js
View File

@@ -324,6 +324,15 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
}).error(defaultErrorHandler(callback));
};
Client.prototype.getNonApprovedApps = function (callback) {
if (!this._config.developerMode) return callback(null, []);
$http.get(client.apiOrigin + '/api/v1/developer/apps').success(function (data, status) {
if (status !== 200 || typeof data !== 'object') return callback(new ClientError(status, data));
callback(null, data.apps || []);
}).error(defaultErrorHandler(callback));
};
Client.prototype.getApp = function (appId, callback) {
var appFound = null;
this._installedApps.some(function (app) {

21
webadmin/src/views/appstore.js
View File

@@ -162,15 +162,22 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
return $timeout(refresh, 1000);
}
$scope.apps = apps;
Client.getNonApprovedApps(function (error, result) {
if (error) {
console.error(error);
return $timeout(refresh, 1000);
}
// show install app dialog immediately if an app id was passed in the query
if ($routeParams.appId) {
var found = apps.filter(function (app) { return (app.id === $routeParams.appId); });
if (found.length) $scope.showInstall(found[0]);
}
$scope.apps = apps.concat(result);
$scope.ready = true;
// show install app dialog immediately if an app id was passed in the query
if ($routeParams.appId) {
var found = apps.filter(function (app) { return (app.id === $routeParams.appId); });
if (found.length) $scope.showInstall(found[0]);
}
$scope.ready = true;
});
});
}