From 2bba87d9519983dcb5dcdc9d9f806ba98a8c28fa Mon Sep 17 00:00:00 2001
From: Johannes <johannes@cloudron.io>
Date: Wed, 30 Nov 2016 17:31:37 +0100
Subject: [PATCH] Add app message angular filter

---
 webadmin/src/js/index.js     | 6 ++++++
 webadmin/src/views/apps.html | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/webadmin/src/js/index.js b/webadmin/src/js/index.js
index f9652ca4c..94e228c2f 100644
--- a/webadmin/src/js/index.js
+++ b/webadmin/src/js/index.js
@@ -104,6 +104,12 @@ app.filter('activeOAuthClients', function () {
     };
 });
 
+app.filter('prettyAppMessage', function () {
+    return function (message) {
+        return message;
+    };
+});
+
 app.filter('installationActive', function () {
     return function(app) {
         if (app.installationState === ISTATES.ERROR) return false;
diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index 9e63879b8..507847819 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -239,7 +239,7 @@
             </div>
             <div class="modal-body">
                 <p><b>There was an error:</b></p>
-                <p>{{appError.app.installationProgress}}</p>
+                <p>{{appError.app.message | prettyAppMessage }}</p>
             </div>
             <div class="modal-footer">
                 <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="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">
                     <div class="grid-item-top">
                         <div class="row">