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 %>
- <%= act.notes.html_safe %>
+ <% if act.notes.nil? %>
+ <% desStr = '' %>
+ <% else %>
+ <% desStr=act.notes.html_safe %>
+ <% end %>
+ | <%= desStr %>
|
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|