Diff
Modified: trunk/app/controllers/users_controller.rb (3035 => 3036)
--- trunk/app/controllers/users_controller.rb 2012-06-18 09:56:35 UTC (rev 3035)
+++ trunk/app/controllers/users_controller.rb 2012-06-18 11:07:03 UTC (rev 3036)
@@ -687,8 +687,6 @@
user.update_attributes(:account_status => "whitelist")
when "sleep"
user.update_attributes(:account_status => "sleep")
- when "hide"
- user.update_attributes(:account_status => "hide")
when "delete"
# build an "all elements" user.xml record
Modified: trunk/app/models/user.rb (3035 => 3036)
--- trunk/app/models/user.rb 2012-06-18 09:56:35 UTC (rev 3035)
+++ trunk/app/models/user.rb 2012-06-18 11:07:03 UTC (rev 3036)
@@ -160,12 +160,7 @@
# Activate user if not previously activated
unless self.activated?
self.activated_at = Time.now
-
- if probable_spammer?
- self.account_status = "hide"
- else
- self.account_status = "sleep"
- end
+ self.account_status = "sleep"
end
return self.save
Modified: trunk/app/views/users/check.rhtml (3035 => 3036)
--- trunk/app/views/users/check.rhtml 2012-06-18 09:56:35 UTC (rev 3035)
+++ trunk/app/views/users/check.rhtml 2012-06-18 11:07:03 UTC (rev 3036)
@@ -153,11 +153,6 @@
changeSelectedKSE("sleep");
break;
- case 104: /* 'h' key */
-
- changeSelectedKSE("hide");
- break;
-
case 120: /* 'x' key */
changeSelectedKSE("delete");
@@ -214,10 +209,6 @@
<label for="" input_name -%>-sleep">Sleep</label>
</div>
<div>
- <input name="<%= input_name -%>" id="<%= input_name -%>-hide" value="hide" type="radio" user[:ob].id -%>').className = 'hide';"/>
- <label for="" input_name -%>-hide">Hide</label>
- </div>
- <div>
<input name="<%= input_name -%>" id="<%= input_name -%>-delete" value="delete" type="radio" user[:ob].id -%>').className = 'delete';"/>
<label for="" input_name -%>-delete">Delete</label>
</div>
Modified: trunk/public/stylesheets/styles.css (3035 => 3036)
--- trunk/public/stylesheets/styles.css 2012-06-18 09:56:35 UTC (rev 3035)
+++ trunk/public/stylesheets/styles.css 2012-06-18 11:07:03 UTC (rev 3036)
@@ -2330,11 +2330,6 @@
background: #c0c0c0;
}
-#user-check-list .hide TD {
- border: 1px solid #c0a080;
- background: #ffe0c0;
-}
-
#user-check-list .delete TD {
border: 1px solid #c08080;
background: #ffc0c0;