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

Add app message angular filter

Browse Source
This commit is contained in:
Johannes
2016-11-30 17:31:37 +01:00
parent d54e02eed4
commit 2bba87d951
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webadmin/src/js/index.js
View File

@@ -104,6 +104,12 @@ app.filter('activeOAuthClients', function () {
}; };
}); });
app.filter('prettyAppMessage', function () {
return function (message) {
return message;
};
});
app.filter('installationActive', function () { app.filter('installationActive', function () {
return function(app) { return function(app) {
if (app.installationState === ISTATES.ERROR) return false; if (app.installationState === ISTATES.ERROR) return false;

4
webadmin/src/views/apps.html
View File

@@ -239,7 +239,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p><b>There was an error:</b></p> <p><b>There was an error:</b></p>
<p>{{appError.app.installationProgress}}</p> <p>{{appError.app.message | prettyAppMessage }}</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">OK</button> <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
@@ -354,7 +354,7 @@
<div class="row animateMeOpacity ng-hide" ng-show="installedApps.length > 0"> <div class="row animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
<div class="col-sm-1 grid-item" ng-repeat="app in installedApps | orderBy:'location'"> <div class="col-sm-1 grid-item" ng-repeat="app in installedApps | orderBy:'location'">
<div style="background-color: white;" class="highlight grid-item-content" uib-tooltip="{{ app.message }}"> <div style="background-color: white;" class="highlight grid-item-content" uib-tooltip="{{ app.message | prettyAppMessage }}">
<a ng-href="{{app | applicationLink}}" ng-click="(app | installError) === true && showError(app)" target="_blank"> <a ng-href="{{app | applicationLink}}" ng-click="(app | installError) === true && showError(app)" target="_blank">
<div class="grid-item-top"> <div class="grid-item-top">
<div class="row"> <div class="row">