From 1582a6135b956eeb355155fe4cc7d140acce708f Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Wed, 6 Mar 2013 20:09:43 -0500
Subject: [PATCH] fixes #779

---
 app/models/artist.rb      |  2 +-
 app/models/forum_post.rb  |  4 ++--
 app/models/forum_topic.rb |  2 +-
 app/models/post.rb        |  4 ++--
 app/models/user.rb        | 16 ++++++++++++++--
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/models/artist.rb b/app/models/artist.rb
index 821f1c16e..e55189620 100644
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -11,7 +11,7 @@ class Artist < ActiveRecord::Base
   has_one :wiki_page, :foreign_key => "title", :primary_key => "name"
   has_one :tag_alias, :foreign_key => "antecedent_name", :primary_key => "name"
   accepts_nested_attributes_for :wiki_page
-  attr_accessible :body, :name, :url_string, :other_names, :other_names_comma, :group_name, :wiki_page_attributes, :notes, :is_active, :as => [:member, :privileged, :platinum, :contributor, :janitor, :moderator, :default, :admin]
+  attr_accessible :body, :name, :url_string, :other_names, :other_names_comma, :group_name, :wiki_page_attributes, :notes, :is_active, :as => [:member, :privileged, :builder, :platinum, :contributor, :janitor, :moderator, :default, :admin]
   attr_accessible :is_banned, :as => :admin
   
   module UrlMethods
diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb
index 730fb72fd..781c12b20 100644
--- a/app/models/forum_post.rb
+++ b/app/models/forum_post.rb
@@ -1,6 +1,6 @@
 class ForumPost < ActiveRecord::Base
-  attr_accessible :body, :topic_id, :as => [:member, :privileged, :platinum, :contributor, :janitor, :admin, :moderator, :default]
-  attr_accessible :is_locked, :is_sticky, :is_deleted, :as => [:admin, :moderator]
+  attr_accessible :body, :topic_id, :as => [:member, :builder, :privileged, :platinum, :contributor, :admin, :moderator, :default]
+  attr_accessible :is_locked, :is_sticky, :is_deleted, :as => [:admin, :moderator, :janitor]
   belongs_to :creator, :class_name => "User"
   belongs_to :topic, :class_name => "ForumTopic"
   before_validation :initialize_creator, :on => :create
diff --git a/app/models/forum_topic.rb b/app/models/forum_topic.rb
index 5799bcf9c..2c5fe1724 100644
--- a/app/models/forum_topic.rb
+++ b/app/models/forum_topic.rb
@@ -1,5 +1,5 @@
 class ForumTopic < ActiveRecord::Base
-  attr_accessible :title, :original_post_attributes, :as => [:member, :privileged, :platinum, :contributor, :janitor, :moderator, :admin, :default]
+  attr_accessible :title, :original_post_attributes, :as => [:member, :builder, :privileged, :platinum, :contributor, :janitor, :moderator, :admin, :default]
   attr_accessible :is_sticky, :is_locked, :is_deleted, :as => [:janitor, :admin, :moderator]
   belongs_to :creator, :class_name => "User"
   belongs_to :updater, :class_name => "User"
diff --git a/app/models/post.rb b/app/models/post.rb
index 3363b4816..98e8ae06e 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -31,8 +31,8 @@ class Post < ActiveRecord::Base
   validates_uniqueness_of :md5
   validates_presence_of :parent, :if => lambda {|rec| !rec.parent_id.nil?}
   # validate :validate_parent_does_not_have_a_parent
-  attr_accessible :source, :rating, :tag_string, :old_tag_string, :last_noted_at, :parent_id, :as => [:member, :privileged, :platinum, :contributor, :janitor, :moderator, :admin, :default]
-  attr_accessible :is_rating_locked, :is_note_locked, :as => [:janitor, :moderator, :admin]
+  attr_accessible :source, :rating, :tag_string, :old_tag_string, :last_noted_at, :parent_id, :as => [:member, :builder, :privileged, :platinum, :contributor, :janitor, :moderator, :admin, :default]
+  attr_accessible :is_rating_locked, :is_note_locked, :as => [:builder, :janitor, :moderator, :admin]
   attr_accessible :is_status_locked, :as => [:admin]
     
   module FileMethods
diff --git a/app/models/user.rb b/app/models/user.rb
index c88e8c4cf..78ea9b242 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -254,11 +254,23 @@ class User < ActiveRecord::Base
     
     def role
       case level
-      when Levels::MEMBER, Levels::PRIVILEGED, Levels::BUILDER, Levels::CONTRIBUTOR
+      when Levels::MEMBER
         :member
         
-      when Levels::MODERATOR, Levels::JANITOR
+      when Levels::PRIVILEGED
+        :privileged
+        
+      when Levels::BUILDER
+        :builder
+      
+      when Levels::CONTRIBUTOR
+        :contributor
+        
+      when Levels::MODERATOR
         :moderator
+
+      when Levels::JANITOR
+        :janitor
         
       when Levels::ADMIN
         :admin