From 73537a30cbd220d181c8dc0933b6913a63866664 Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Wed, 20 Aug 2014 11:39:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E4=BA=BA=E4=B8=8D=E8=83=BD=E4=B8=8B=E8=BD=BD=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA=E9=9D=9E=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb |  2 +-
 app/views/messages/_project_show.html.erb |  4 ++--
 db/schema.rb                              | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 44d68de26..c58cd3f82 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -79,7 +79,7 @@ class AttachmentsController < ApplicationController
     else
       candown = @attachment.is_public == 1
     end
-    if candown || User.current.admin?
+    if candown || User.current.admin? || User.current.id == @attachment.author_id
       @attachment.increment_download
 
       if stale?(:etag => @attachment.digest)
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 3bc9b6943..ad91c72f8 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -156,10 +156,10 @@
                               :data => {:confirm => l(:text_are_you_sure)},
                               :title => l(:button_delete)
                       ) if message.destroyable_by?(User.current) %>
-                </div></td>
+                </div>
+              </td>
             </tr>
             <tr>
-
               <td class="comments">
                 <div class="wiki" style="width: 100%;word-break: break-all;">
                   <%= textAreailizable message,:content,:attachments => message.attachments %>
diff --git a/db/schema.rb b/db/schema.rb
index 7d908db6f..cdedc6a2c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140814062455) do
+ActiveRecord::Schema.define(:version => 20140812065417) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -448,14 +448,14 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
   end
 
   create_table "forums", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.text     "description"
+    t.string   "name",                         :null => false
+    t.string   "description",  :default => ""
     t.integer  "topic_count",  :default => 0
     t.integer  "memo_count",   :default => 0
     t.integer  "last_memo_id", :default => 0
-    t.integer  "creator_id",                  :null => false
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
+    t.integer  "creator_id",                   :null => false
+    t.datetime "created_at",                   :null => false
+    t.datetime "updated_at",                   :null => false
   end
 
   create_table "groups_users", :id => false, :force => true do |t|