better UX for user editing form. fixes #615

Author: Lennart Koopmann

app/controllers/UsersController.java

@@ -308,15 +308,15 @@ public Result resetPermissions(String username) {
         final DynamicForm requestForm = Form.form().bindFromRequest();
 
         boolean isAdmin = false;
-        final String field = requestForm.get("admin");
-        if (field != null && field.equalsIgnoreCase("on")) {
+        final String field = requestForm.get("permissiontype");
+        if (field != null && field.equalsIgnoreCase("admin")) {
             isAdmin = true;
         }
         final User user = userService.load(username);
 
         if (!Permissions.isPermitted(USERS_PERMISSIONSEDIT) || user.isReadonly()) {
             flash("error", "Unable to reset permissions!");
-            return redirect(routes.UsersController.index());
+            return redirect(routes.UsersController.editUserForm(username));
         }
 
         final ChangeUserRequest changeRequest = new ChangeUserRequest(user);
@@ -331,7 +331,7 @@ public Result resetPermissions(String username) {
         } else {
             flash("error", "Unable to reset permissions for user " + user.getFullName());
         }
-        return redirect(routes.UsersController.index());
+        return redirect(routes.UsersController.editUserForm(username));
     }
 
     private static BreadcrumbList breadcrumbs() {

app/views/system/users/edit.scala.html

@@ -163,44 +163,57 @@ <h1><i class="icon icon-edit"></i> Edit user &raquo;@username&laquo;</h1>
             }
         </div>
     </div>
+
     @if(isPermitted(USERS_PERMISSIONSEDIT)) {
     <div class="row-fluid">
         <h2><h2><i class="icon icon-bolt"></i> Change Permissions</h2>
 
         <form class="form form-horizontal" action="@routes.UsersController.resetPermissions(user.getName)" method="POST">
-            <button class="btn btn-danger" type="submit" data-confirm="Really reset permissions for @user.getName?" style="margin-top: 10px; margin-bottom: 10px;">
-                Reset Permissions
-            </button>
 
-            <label class="checkbox">
-                <input type="checkbox" id="admin" name="admin" @if(isPermitted(user, "*")) {selected} />
-                Assign administrator permissions?
+            <label class="radio" style="margin-top: 5px;">
+                <input type="radio" name="permissiontype" value="admin" @if(isPermitted(user, "*")) { checked="checked" } />
+                Set to administrator permissions
+            </label>
+
+            <label class="radio">
+                <input type="radio" name="permissiontype" value="reader" @if(!isPermitted(user, "*")) { checked="checked" } />
+                Set to reader permissions
             </label>
 
-            All permissions will be reset, assigned stream permissions will be lost!
+            <button class="btn btn-warning btn-small" type="submit" data-confirm="Really reset permissions for @user.getName?" style="margin-top: 10px; margin-bottom: 10px;">
+                Set default permissions
+            </button>
+
+            <p>
+                Previously assigned stream and dashboard permissions will be lost!
+            </p>
         </form>
 
     </div>
     }
+
     <div class="row-fluid">
-        <form action="@routes.StartpageController.reset(user.getName)" method="POST" class="pull-right">
-            <button type="submit" class="btn btn-danger btn-small" data-confirm="Really reset startpage?">
+        <h2><i class="icon icon-circle-arrow-right"></i> Custom startpage</h2>
+
+        <p>
+            @if(user.getStartpage == null) {
+                No custom startpage configured yet.
+            } else {
+                The startpage is currently set to
+                <em>@user.getStartpage.getType.toString.toLowerCase</em> with ID
+                <em>@user.getStartpage.getId</em>.
+
+                <a href="@user.getStartpage.getCall">
+                    &nbsp;<i class="icon icon-angle-right"></i> Open
+                </a>
+
+            }
+        </p>
+
+        <form action="@routes.StartpageController.reset(user.getName)" method="POST">
+            <button type="submit" class="btn btn-primary btn-small" data-confirm="Really reset startpage?">
                 Reset custom startpage
             </button>
         </form>
-
-        <h2><i class="icon icon-circle-arrow-right"></i> Custom startpage</h2>
-        @if(user.getStartpage == null) {
-            No custom startpage configured yet.
-        } else {
-            The startpage is currently set to
-            <em>@user.getStartpage.getType.toString.toLowerCase</em> with ID
-            <em>@user.getStartpage.getId</em>.
-
-            <a href="@user.getStartpage.getCall">
-                &nbsp;<i class="icon icon-angle-right"></i> Open
-            </a>
-
-        }
     </div>
 }