From a43021e87c6a2f33a49bec763df6059a9eb3f2a8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 7 Apr 2021 17:46:17 +0200
Subject: [PATCH] Fix for #1938

---
 cps/static/js/table.js        |  2 +-
 cps/templates/user_table.html | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 96901d0b..332b7f54 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -618,7 +618,7 @@ function responseHandler(res) {
 }
 
 function singleUserFormatter(value, row) {
-    return '<a class="btn btn-default" href="/admin/user/' + row.id + '">' + this.buttontext + '</a>'
+    return '<a class="btn btn-default" href="' + window.location.pathname + '/../../admin/user/' + row.id + '">' + this.buttontext + '</a>'
 }
 
 function checkboxFormatter(value, row, index){
diff --git a/cps/templates/user_table.html b/cps/templates/user_table.html
index e7ddf156..a7bee4f6 100644
--- a/cps/templates/user_table.html
+++ b/cps/templates/user_table.html
@@ -111,13 +111,13 @@
             {{ user_table_row('allowed_column_value', _("Edit Allowed Column Values"), _("Allowed Column Values"), false, true, 2) }}
             {{ user_table_row('denied_column_value', _("Edit Denied Column Values"), _("Denied Columns Values"), false, true, 3) }}
             {{ user_checkbox_row("role", "admin_role", _('Admin'), visiblility, all_roles)}}
-            {{ user_checkbox_row("role", "download_role",_('Upload'), visiblility, all_roles)}}
-            {{ user_checkbox_row("role", "upload_role", _('Download'), visiblility, all_roles)}}
-            {{ user_checkbox_row("role", "edit_role", _('Edit'), visiblility, all_roles)}}
             {{ user_checkbox_row("role", "passwd_role", _('Change Password'), visiblility, all_roles)}}
-            {{ user_checkbox_row("role", "edit_shelf_role", _('Edit Public Shelfs'), visiblility, all_roles)}}
-            {{ user_checkbox_row("role", "delete_role", _('Delete'), visiblility, all_roles)}}
+            {{ user_checkbox_row("role", "upload_role",_('Upload'), visiblility, all_roles)}}
+            {{ user_checkbox_row("role", "download_role", _('Download'), visiblility, all_roles)}}
             {{ user_checkbox_row("role", "viewer_role", _('View'), visiblility, all_roles)}}
+            {{ user_checkbox_row("role", "edit_role", _('Edit'), visiblility, all_roles)}}
+            {{ user_checkbox_row("role", "delete_role", _('Delete'), visiblility, all_roles)}}
+            {{ user_checkbox_row("role", "edit_shelf_role", _('Edit Public Shelfs'), visiblility, all_roles)}}
             {{ user_checkbox_row("sidebar_view", "detail_random", _('Show Random Books in Detail View'), visiblility, sidebar_settings)}}
             {{ user_checkbox_row("sidebar_view", "sidebar_language", _('Show language selection'), visiblility, sidebar_settings)}}
             {{ user_checkbox_row("sidebar_view", "sidebar_series", _('Show series selection'), visiblility, sidebar_settings)}}