From 7b2ae2c4571229893ec4330a363ef3c23ffdcfd2 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Tue, 21 May 2019 00:14:44 -0700
Subject: [PATCH] Make reset show the original icon

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

diff --git a/src/views/apps.html b/src/views/apps.html
index 400acf83c..18ed6ea4e 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -111,9 +111,9 @@
                               </div>
                               <div class="form-group">
                                 <label class="control-label">Icon</label>
-                                <a href="" class="pull-right" style="font-weight: normal;" ng-click="appConfigure.icon.data = ''">Reset</a>
+                                <a href="" class="pull-right" style="font-weight: normal;" ng-click="appConfigure.resetCustomIcon()">Reset</a>
                                 <div>
-                                  <img id="previewIcon" width="128" height="128" ng-src="{{appConfigure.icon.data || appConfigure.app.iconUrl}}" ng-click="appConfigure.showCustomIconSelector()"/>
+                                  <img id="previewIcon" width="128" height="128" ng-src="{{appConfigure.icon.data || appConfigure.icon.url || appConfigure.app.iconUrl}}" ng-click="appConfigure.showCustomIconSelector()"/>
                                   <input type="file" id="iconFileInput" style="display: none" accept="image/png"/>
                                 </div>
                               </div>
diff --git a/src/views/apps.js b/src/views/apps.js
index 4615debe3..d5e020558 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -50,7 +50,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         ssoAuth: false,
         tags: '',
         label: '',
-        icon: { data: null },
+        icon: { file: null, data: null, url: null },
 
         action: 'general',
 
@@ -254,6 +254,11 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             });
         },
 
+        resetCustomIcon: function () {
+            $scope.appConfigure.icon.data = '';
+            $scope.appConfigure.icon.url = $scope.appConfigure.app.iconUrl + '&original=true';
+        },
+
         showCustomIconSelector: function () {
             $('#iconFileInput').click();
         }