#102 closed: "Remove Deleted column in user list"

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

Hide file tree

Showing 4 changed files with 38 additions and 26 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
@@ -84,7 +84,6 @@ class User extends ProtoUser[User] with OneToMany[Long, User]  {
     <row id={id.toString}>
       <cell>{profileHyperlink.toString}</cell>
       <cell><row:superuser /></cell>
-      <cell><row:delete /></cell>
       <cell><row:banned /></cell>
     </row>
 
@@ -95,12 +94,6 @@ class User extends ProtoUser[User] with OneToMany[Long, User]  {
           save
           Noop
         }).toString,
-      "delete" -> SHtml.ajaxCheckbox(
-        deleted_?, bool => {
-          deleted(bool)
-          save
-          Noop
-        }).toString,
       "banned" -> SHtml.ajaxCheckbox(
         banned, bool => {
           banned(bool)

diff --git a/src/main/scala/scala/tools/colladoc/snippet/ProfileOps.scala b/src/main/scala/scala/tools/colladoc/snippet/ProfileOps.scala
@@ -197,23 +197,39 @@ class ProfileOps {
   }
 
   def deleteProfile(user: User) = {
-    <div id="delete_account">
-      {
-        SHtml.a(
-          ColladocConfirm("Confirm delete"),
-          () => {
-            user.deleted(true).save
-            S.notice("Account " + user.userName + " successfully deleted")
-            if (User.currentUser.open_! == user) {
-              User.logout
-              RedirectTo("/")
-            } else {
+    if (!user.deleted_?)
+      <div id="delete_account">
+        {
+          SHtml.a(
+            ColladocConfirm("Confirm delete"),
+            () => {
+              user.deleted(true).save
+              S.notice("Account " + user.userName + " successfully deleted")
+              if (User.currentUser.open_! == user) {
+                User.logout
+                RedirectTo("/")
+              } else {
+                Noop
+              }
+            },
+            Text("Delete account"))
+        }
+      </div>
+    else if (User.superUser_? && user.deleted_?)
+      <div id="recover_account">
+        {
+          SHtml.a(
+            ColladocConfirm("Confirm recover"),
+            () => {
+              user.deleted(false).save
+              S.notice("Account " + user.userName + " successfully recovered")
               Noop
-            }
-          },
-          Text("Delete account"))
-      }
+            },
+            Text("Recover account"))
+        }
       </div>
+    else
+      NodeSeq.Empty
   }
 
   def body(xhtml: NodeSeq): NodeSeq = {

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