Added permissions to badges

app/models/badge.rb

@@ -1,6 +1,7 @@
 class Badge < ActiveRecord::Base
   include Comparable
   has_many :users
+  has_and_belongs_to_many :forums
 
   def self.get (input)
     if input.is_a?(String) || input.is_a?(Symbol)

app/models/badgeassociation.rb

@@ -0,0 +1,7 @@
+class Badgeassociation < ActiveRecord::Base
+
+  belongs_to :badge
+  belongs_to :forum
+  belongs_to :forumgroup
+
+end

app/models/forum.rb

@@ -1,6 +1,10 @@
 class Forum < ActiveRecord::Base
   belongs_to :forumgroup
   has_many :forumthreads
+
+  has_many :badgeassociations
+  has_many :badges, through: :badgeassociations
+
   belongs_to :role_read, class_name: "Role", foreign_key: "role_read_id"
   belongs_to :role_write, class_name: "Role", foreign_key: "role_write_id"
   has_and_belongs_to_many :labels
@@ -18,11 +22,11 @@ class Forum < ActiveRecord::Base
   end
 
   def can_read?(user)
-    group && group.can_read?(user) && (role_read.nil? || (!user.nil? && user.role >= role_read))
+    group && group.can_read?(user) && (role_read.nil? || (!user.nil? && user.role >= role_read) || Badgeassociation.find_by(badge: user.badge, forum: self, permission: 1))
   end
 
   def can_write?(user)
-    group.can_write?(user) && (role_write.nil? || (!user.nil? && user.role >= role_write))
+    group.can_write?(user) && (role_write.nil? || (!user.nil? && user.role >= role_write || Badgeassociation.find_by(badge: user.badge, forum: self, permission: 2)))
   end
 
   def can_view?(user)

app/models/forumgroup.rb

@@ -4,7 +4,8 @@ class Forumgroup < ActiveRecord::Base
   belongs_to :role_write, class_name: "Role", foreign_key: "role_write_id"
   accepts_nested_attributes_for :forums
 
-
+  has_many :badgeassociations
+  has_many :badges, through: :badgeassociations
 
   validates_presence_of :name, :position
   validates_length_of :name, in: 2..20
@@ -14,11 +15,11 @@ class Forumgroup < ActiveRecord::Base
   end
 
   def can_read?(user)
-    role_read.nil? || (!user.nil? && user.role >= role_read)
+    role_read.nil? || (!user.nil? && user.role >= role_read) || Badgeassociation.find_by(badge: user.badge, forumgroup: self, permission: 1)
   end
 
   def can_write?(user)
-    !user.nil? && user.confirmed? && (role_write.nil? || user.role >= role_write)
+    !user.nil? && user.confirmed? && (role_write.nil? || user.role >= role_write) || Badgeassociation.find_by(badge: user.badge, forumgroup: self, permission: 2)
   end
 
   def can_view?(user)

app/models/forumthread.rb

@@ -70,7 +70,7 @@ class Forumthread < ActiveRecord::Base
     order_phrase = query || [title, content, reply].select(&:present?).join(" ")
     user_id = user.try(:id).to_i
     role_value = user.try(:role).to_i
-    can_read = "COALESCE(forum_role_read.value, 0) <= ? AND COALESCE(forumgroup_role_read.value, 0) <= ?"
+    can_read = "(COALESCE(forum_role_read.value, 0) <= ? AND COALESCE(forumgroup_role_read.value, 0) <= ?)"
     # A user can view sticky threads in write-only forums without read permissions.
     sticky_can_write = "sticky = true AND (COALESCE(forum_role_write.value, 0) <= ? AND COALESCE(forumgroup_role_write.value, 0) <= ?)"
     match = ["MATCH (title, forumthreads.content) AGAINST (#{Forumthread.sanitize(order_phrase)})", "MATCH (threadreplies.content) AGAINST (#{Forumthread.sanitize(order_phrase)})", "MATCH (title, forumthreads.content) AGAINST (?) OR MATCH (threadreplies.content) AGAINST (?)", "MATCH (title) AGAINST (?)", "MATCH (forumthreads.content) AGAINST (?)", "MATCH (threadreplies.content) AGAINST (?)"]
@@ -86,7 +86,7 @@ class Forumthread < ActiveRecord::Base
     .joins("LEFT JOIN roles as forumgroup_role_read ON forumgroups.role_read_id = forumgroup_role_read.id")
     .joins("LEFT JOIN roles as forumgroup_role_write ON forumgroups.role_write_id = forumgroup_role_write.id")
 
-    threads = threads.where("forumthreads.user_author_id = ? OR (#{can_read}) OR (#{sticky_can_write})", user_id, role_value, role_value, role_value, role_value)
+    threads = threads.where("forumthreads.user_author_id = ? OR (#{can_read}) OR (#{sticky_can_write}) OR (?)", user_id, role_value, role_value, role_value, role_value, Forum.find(forum).can_read?(user))
     if query
       threads = threads.where("#{match[2]}", query[0..99], query[0..99])
     elsif [title, content, reply].any?