From 63470476a589e2f662d2258e89232e8687e48420 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 5 Sep 2014 16:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=95=99=E4=B8=8B=E7=9A=84=E6=96=B0=E6=89=8B=E8=AE=A8?=
 =?UTF-8?q?=E8=AE=BA=E5=90=A7=E3=80=81=E7=BD=91=E7=AB=99=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=90=A7=E5=88=9B=E5=BB=BA=E4=BA=BA=E4=B8=BA=E7=A9=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=97=B6=E5=8A=A0=E4=B8=8A=E9=9D=9E=E7=A9=BA?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_forums.html.erb |  2 ++
 db/schema.rb                           | 30 ++++++++++++++------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index ef376c2ec..4d981c23a 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -60,11 +60,13 @@
 									<div style="padding-top: 20px" >
 									<span class="forums-avatar-left"><%= image_tag(url_to_avatar(@forum.creator), :class =>'vatar-size') %></span>
 									<span class="forums-avatar-right">
+                                      <% unless @forum.creator.nil? %>
 										<%=link_to @forum.creator.name, user_path(@forum.creator) %>
 										<div>
 											<%= link_to l(:label_user_watcher)+"("+User.watched_by(@forum.creator.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist", :id => @forum.creator.id %>	
 											<%= link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@forum.creator.watcher_users(@forum.creator.id).count.to_s+")", :controller=>"users", :action=>"user_fanslist", :id => @forum.creator.id %>
 										</div>
+                                       <% end %>
 									</span>
 									</div>																																																
 								</div>
diff --git a/db/schema.rb b/db/schema.rb
index db51ddd37..95c52cca3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -878,18 +878,18 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
+    t.string   "subject",                               :null => false
+    t.text     "content",                               :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
+    t.integer  "replies_count",      :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
+    t.boolean  "lock",               :default => false
+    t.boolean  "sticky",             :default => false
+    t.boolean  "is_quote",           :default => false
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+    t.integer  "viewed_count_crawl", :default => 0
+    t.integer  "viewed_count_local", :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -976,11 +976,10 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
     t.string   "url"
     t.string   "title"
     t.integer  "share_type"
-    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.integer  "project_id"
     t.integer  "user_id"
-    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -1086,8 +1085,8 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
     t.integer  "zip_code"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
-    t.string   "technical_title"
     t.integer  "identity"
+    t.string   "technical_title"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1145,6 +1144,9 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
     t.integer  "active"
     t.datetime "created_at",    :null => false
     t.datetime "updated_at",    :null => false
+    t.integer  "level"
+    t.integer  "file"
+    t.integer  "issue"
   end
 
   create_table "user_statuses", :force => true do |t|