diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 94890a368..4e42cd5ae 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -22,6 +22,7 @@
<% end %>
<% if ma.forge_message_type == "JoinProject" %>
+ <% unless ma.project.nil? %>
+ <% end %>
<% end %>
-
+
<% if ma.forge_message_type == "RemoveFromProject" %>
-
diff --git a/db/schema.rb b/db/schema.rb
index 9ce76c447..91a9fbb5d 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 => 20151210110210) do
+ActiveRecord::Schema.define(:version => 20151209085942) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -459,7 +459,7 @@ ActiveRecord::Schema.define(:version => 20151210110210) do
t.integer "open_student", :default => 0
t.integer "outline", :default => 0
t.integer "publish_resource", :default => 0
- t.integer "is_delete"
+ t.integer "is_delete", :default => 0
end
create_table "custom_fields", :force => true do |t|
@@ -970,7 +970,6 @@ ActiveRecord::Schema.define(:version => 20151210110210) do
t.integer "course_group_id", :default => 0
end
- add_index "members", ["course_id"], :name => "index_members_on_course_id"
add_index "members", ["project_id"], :name => "index_members_on_project_id"
add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
add_index "members", ["user_id"], :name => "index_members_on_user_id"