From 00cf448bda7be4f58b0313aa2b3e03f0b1558820 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Mon, 28 Jul 2014 09:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E7=A9=BA=E7=95=99=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/show.html.erb | 7 ++++++-
 db/schema.rb                  | 8 +++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 6270b5f50..7c016e33b 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -137,7 +137,12 @@
                       <% end %>
                     </tr>
                     <tr>
-                      <td colspan="2" width="580"><p class="font_description"> <%= act.notes.html_safe %> </p>
+                      <% if act.notes.nil? %>
+                          <% desStr = '' %>
+                      <% else %>
+                          <% desStr=act.notes.html_safe %>
+                      <% end %>
+                      <td colspan="2" width="580"><p class="font_description"> <%= desStr %> </p>
                       </td>
                     </tr>
                     <tr>
diff --git a/db/schema.rb b/db/schema.rb
index c34e15d93..219666f79 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 => 20140725034309) do
+ActiveRecord::Schema.define(:version => 20140725073357) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -419,10 +419,12 @@ ActiveRecord::Schema.define(:version => 20140725034309) do
     t.string   "web_title"
     t.string   "title"
     t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
     t.string   "page_type"
     t.integer  "sort_type"
+    t.integer  "image_width",  :default => 107
+    t.integer  "image_height", :default => 63
   end
 
   create_table "forums", :force => true do |t|