Merge branch 'moderators' of https://github.com/tehviking/hackety-hack.com

steveklabnik · steveklabnik · commit eeb18d7db16a · 2012-01-05T17:46:42.000-05:00
diff --git a/app/assets/stylesheets/questions.css.scss b/app/assets/stylesheets/questions.css.scss
@@ -107,3 +107,8 @@
   	background: rgba(158, 183,68, 0.1) url("accepted.png") 99% 0.5em no-repeat;
   }
 }
+
+.move_question {
+  float:right;
+  padding-top:4px;
+}
diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -4,7 +4,11 @@ class Ability
   def initialize(user)
     user ||= User.new
 
-    can :read, :all
+    if user.moderator?
+      can :manage, :all
+    else
+      can :read, :all
+    end
 
     unless user.new_record?
       can :create, [Question, Answer]
diff --git a/app/models/question.rb b/app/models/question.rb
@@ -14,5 +14,5 @@ class Question
 
   scope :newest_first, sort(:created_at.desc)
   scope :supports, where(:support => true )
-  scope :no_supports, where(:support => nil)
+  scope :no_supports, where('$or' => [{:support=> false}, {:support => nil}])
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -8,6 +8,7 @@ class User
   key :username, String
   key :email, String
   key :about, String
+  key :moderator, Boolean
 
   many :questions
   many :answers
diff --git a/app/views/questions/_list.html.haml b/app/views/questions/_list.html.haml
@@ -11,3 +11,5 @@
       %span.date= time_ago_in_words(list.created_at)
       ago
     .description= truncate(list.description, :length => 150)
+    - if current_user && current_user.moderator?
+      %div.move_question= link_to "Move to #{list.support? ? 'Questions' : 'Support'} »", question_path(list, :question => { :support => (list.support? ? "false" : "true") }), :method => :put, :class => "btn small info"

Original file line number	Diff line number	Diff line change
`@@ -107,3 +107,8 @@`
`107`	`107`	`background: rgba(158, 183,68, 0.1) url("accepted.png") 99% 0.5em no-repeat;`
`108`	`108`	`}`
`109`	`109`	`}`
	`110`	`+`
	`111`	`+.move_question {`
	`112`	`+ float:right;`
	`113`	`+ padding-top:4px;`
	`114`	`+}`