aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2012-05-15 11:04:50 +0100
committerSeb Bacon <seb.bacon@gmail.com>2012-05-23 09:15:49 +0100
commitce72f203bbeb6ee5ae356f12b007b9631cf0dd7a (patch)
tree911efe64de32e4103cd4999d2f0c53cd0a8b6840 /app/models/user.rb
parent20b2a3c493d19b1ea66ba2605053af05f0595f7f (diff)
Merge from wombleton:feature/440_sparkly_admin_css
Includes a couple of additional fixes: * Remember to HTML-quote things that could come from users * Fix form post action for editing users
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb12
1 files changed, 11 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index cd8d3e721..4a7153b3f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -400,6 +400,17 @@ class User < ActiveRecord::Base
return self.email_confirmed
end
+ def for_admin_column(complete = false)
+ if complete
+ columns = self.class.content_columns
+ else
+ columns = self.class.content_columns.map{|c| c if %w(created_at updated_at admin_level email_confirmed).include?(c.name) }.compact
+ end
+ columns.each do |column|
+ yield(column.human_name, self.send(column.name), column.type.to_s)
+ end
+ end
+
## Private instance methods
private
@@ -430,4 +441,3 @@ class User < ActiveRecord::Base
end
end
-