Merge branch 'devel'

xufeng · Apr 2, 2011 · 938a0a8 · 938a0a8
2 parents f70452f + 994e476
commit 938a0a8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -52,6 +52,13 @@ def muted
   def update_in_place
     # TODO: Here need to chack permission
     klass, field, id = params[:id].split('__')
+    puts params[:id]
+
+    # 验证权限,用户是否有修改制定信息的权限
+    case klass
+    when "user" then return if current_user.id.to_s != id
+    end
+
     object = klass.camelize.constantize.find(id)
     if object.update_attributes(field => params[:value])
       render :text => object.send(field).to_s

diff --git a/app/models/comment.rb b/app/models/comment.rb
@@ -8,6 +8,8 @@ class Comment
   belongs_to :commentable, :polymorphic => true
   belongs_to :user
 
+  validates_presence_of :body
+
   before_create :fix_commentable_id
   def fix_commentable_id
     if self.commentable_id.class == "".class