From 03ca4887ba7fe8226d6a8abe49439461825d4b0d Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 21 Jan 2016 15:06:22 +0100
Subject: [PATCH] Streamline the app restore password validation

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

diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index b5886f36b..3a8139017 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -110,9 +110,13 @@
                 <p ng-show="appRestore.app.lastBackupId === null">This app was never backed up. Restoring the app will lose all content!</p>
                 <fieldset>
                     <form class="form-signin" role="form" name="appRestoreForm" ng-submit="doRestore()" autocomplete="off">
-                        <div class="form-group" ng-class="{ 'has-error': (!appRestoreForm.password.$dirty && appRestore.error.password) || (appRestoreForm.password.$dirty && appRestoreForm.password.$invalid) }">
+                        <div class="form-group" ng-class="{ 'has-error': (appRestoreForm.password.$dirty && appRestoreForm.password.$invalid) || (!appRestoreForm.password.$dirty && appRestore.error.password) }">
                             <label class="control-label" for="appRestorePasswordInput">Provide your password to confirm this action</label>
-                            <input type="password" class="form-control" ng-model="appRestore.password" id="appRestorePasswordInput" name="password" ng-maxlength="30" ng-minlength="8" required autofocus>
+                            <div class="control-label" ng-show="(appRestoreForm.password.$dirty && appRestoreForm.password.$invalid) || (!appRestoreForm.password.$dirty && appRestore.error.password)">
+                                <small ng-show=" appRestoreForm.password.$dirty && appRestoreForm.password.$invalid">Password required</small>
+                                <small ng-show="!appRestoreForm.password.$dirty && appRestore.error.password">Wrong password</small>
+                            </div>
+                            <input type="password" class="form-control" ng-model="appRestore.password" id="appRestorePasswordInput" name="password" required autofocus>
                         </div>
 
                         <input class="ng-hide" type="submit" ng-disabled="appRestoreForm.$invalid || busy"/>
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index 0c4335274..6ebb5f5c2 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -233,6 +233,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             if (error && error.statusCode === 403) {
                 $scope.appRestore.password = '';
                 $scope.appRestore.error.password = true;
+                $scope.appRestoreForm.password.$setPristine();
                 $('#appRestorePasswordInput').focus();
             } else if (error) {
                 Client.error(error);