#103 closed: "Remove Superuser column from user list"

colladoc · Aug 3, 2011 · f443ee6 · f443ee6
1 parent 059d1fe
commit f443ee6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/src/main/scala/scala/tools/colladoc/model/mapper/User.scala b/src/main/scala/scala/tools/colladoc/model/mapper/User.scala
@@ -83,17 +83,10 @@ class User extends ProtoUser[User] with OneToMany[Long, User]  {
     val row =
     <row id={id.toString}>
       <cell>{profileHyperlink.toString}</cell>
-      <cell><row:superuser /></cell>
       <cell><row:banned /></cell>
     </row>
 
     bind("row", row,
-      "superuser" -> SHtml.ajaxCheckbox(
-        superUser, bool => {
-          superUser(bool)
-          save
-          Noop
-        }).toString,
       "banned" -> SHtml.ajaxCheckbox(
         banned, bool => {
           banned(bool)

diff --git a/src/main/scala/scala/tools/colladoc/page/Profile.scala b/src/main/scala/scala/tools/colladoc/page/Profile.scala
@@ -53,6 +53,7 @@ class Profile(rootPack: Package) extends scala.tools.colladoc.page.Template(root
           <div id="account_admin_tab">
               <profile:change_password />
               <profile:delete_profile />
+              <profile:superuser />
           </div>
           <div id="comments_tab">
             <profile:comments />

diff --git a/src/main/scala/scala/tools/colladoc/snippet/ProfileOps.scala b/src/main/scala/scala/tools/colladoc/snippet/ProfileOps.scala
@@ -232,6 +232,19 @@ class ProfileOps {
       NodeSeq.Empty
   }
 
+  def superuser(user: User) = {
+    <div id="superuser_wrapper">
+      <label for="superuser">Superuser</label>
+      {
+        SHtml.ajaxCheckbox(
+          user.superUser, bool => {
+            user.superUser(bool).save
+            Noop
+          }, ("id", "superuser"))
+      }
+    </div>
+  }
+
   def body(xhtml: NodeSeq): NodeSeq = {
     val user = getUser
 
@@ -265,6 +278,7 @@ class ProfileOps {
       "form"                -> { if (!public_?) userForm(user) else publicProfile(user) },
       "change_password"     -> { if (!public_?) changePasswordForm(user) else NodeSeq.Empty },
       "delete_profile"      -> { if (!public_?) deleteProfile(user) else NodeSeq.Empty },
+      "superuser"           -> { if (User.validSuperUser_?) superuser(user) else NodeSeq.Empty },
       "discussion_comments" -> { if (User.loggedIn_?) discussionComments else NodeSeq.Empty },
       "fullname"            -> Text(fullname),
       "comments"            -> comments

diff --git a/src/main/webapp/coprofile.css b/src/main/webapp/coprofile.css
@@ -74,4 +74,12 @@
 
 #recover_account > a {
     font-weight: bold;
+}
+
+#superuser_wrapper {
+    margin-top: 8px;
+}
+
+#superuser_wrapper > label {
+    font-weight: bold;
 }
diff --git a/src/main/webapp/scripts/cosettings.js b/src/main/webapp/scripts/cosettings.js
@@ -27,10 +27,9 @@ $(document).ready(function() {
   $("#userlist").jqGrid({
     url:'grid/users?',
     datatype: "xml",
-    colNames:['Username', 'Superuser', 'Banned'],
+    colNames:['Username', 'Banned'],
     colModel:[
       {name: 'profile', index: 'profile'},
-      {name: 'superuser', index: 'superuser', width: 60},
       {name: 'banned', index: 'banned', width: 60}
     ],
     rowList:[5,10,20,30],