From 180645138953cc03071b0eed29a3d382b5faacf5 Mon Sep 17 00:00:00 2001
From: root <stremovsky@gmail.com>
Date: Sat, 5 Dec 2020 15:46:54 +0000
Subject: [PATCH] Ask for reason before executing the operation

---
 src/requests_api.go              | 9 +++++++--
 ui/site/admin-view-requests.html | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/requests_api.go b/src/requests_api.go
index 6ca196c..fe2c817 100644
--- a/src/requests_api.go
+++ b/src/requests_api.go
@@ -284,6 +284,12 @@ func (e mainEnv) cancelUserRequest(w http.ResponseWriter, r *http.Request, ps ht
 	if enforceUUID(w, request, event) == false {
 		return
 	}
+	records, err := getJSONPostData(r)
+	if err != nil {
+		returnError(w, r, "failed to decode request body", 405, err, event)
+		return
+	}
+	reason := getStringValue(records, "reason");
 	requestInfo, err := e.db.getRequest(request)
 	if err != nil {
 		returnError(w, r, "internal error", 405, err, event)
@@ -315,8 +321,7 @@ func (e mainEnv) cancelUserRequest(w http.ResponseWriter, r *http.Request, ps ht
 		returnError(w, r, "not found", 405, err, event)
 		return
 	}
-	reason := ""
-	if authResult == "login" {
+	if len(reason) == 0 && authResult == "login" {
 		reason = "user operation"
 	}
 	e.db.updateRequestStatus(request, "canceled", reason)
diff --git a/ui/site/admin-view-requests.html b/ui/site/admin-view-requests.html
index aebb7d2..19ce850 100644
--- a/ui/site/admin-view-requests.html
+++ b/ui/site/admin-view-requests.html
@@ -85,7 +85,11 @@
           <label for="reason" class="col-sm-3 col-form-label">Reason</label>
           <div class="col-sm-9"><textarea class="form-control" id="reason" rows="2"></textarea>
           </div></div></form>`;
-        var btn = `<button type="submit" class="btn btn-primary" id="submitButton">Approve</button>`;
+	var bTitle = 'Approve';
+	if (action == "cancel") {
+          bTitle = 'Reject';
+	}
+        var btn = `<button type="submit" class="btn btn-primary" id="submitButton">`+bTitle+`</button>`;
         var modal = showForm(title0, form, btn);
         modal.find('#submitButton').click(function (event) {
 	  modal.modal('hide');