diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index ebb7c2fc8..69d8bc3a6 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -122,7 +122,7 @@ class MyController < ApplicationController
if @user.save && @se.save
# 头像保存
- FileUtils.mv diskfile1, diskfile, force: true
+ FileUtils.mv diskfile1, diskfile, force: true if File.exist? diskfile1
@user.pref.save
@user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
set_language_if_valid @user.language
diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb
index 6b66b0fba..1161e9f8a 100644
--- a/app/views/messages/_form_course.html.erb
+++ b/app/views/messages/_form_course.html.erb
@@ -9,9 +9,9 @@
<%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585 fl" }.merge(extra_option) %>
<% else %>
<%= f.text_field :subject, { size: 60, id: "message_subject", onkeyup: "regexSubject();",:class=>"talk_input w585" }.merge(extra_option) %>
+
<% end %>
-
<% unless replying %>
diff --git a/db/schema.rb b/db/schema.rb
index cd5cb1599..e798dba1c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -438,6 +438,13 @@ ActiveRecord::Schema.define(:version => 20150505025537) do
add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+ create_table "discuss_demos", :force => true do |t|
+ t.string "title"
+ t.text "body"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "documents", :force => true do |t|
t.integer "project_id", :default => 0, :null => false
t.integer "category_id", :default => 0, :null => false
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 46cc8b431..f0b1338da 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -526,6 +526,7 @@ $(function(){
//查找TAG资源
function search_tag_attachment(url,tag_name,q,course_id,sort)
{
+ //alert("111");
$.get(
url,
{
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 065c57bd0..f49ef22f1 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -481,7 +481,7 @@ a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; col
/*日历选择图*/
img.ui-datepicker-trigger {
display:block;
- background:url(/images/public_icon.png) -31px 0 no-repeat;
+ background:url(../images/public_icon.png) -31px 0 no-repeat;
cursor: pointer;
vertical-align: middle;
margin-left: 5px;