- 创建教师 <%=syllabus.user.show_name %> 创建教师 <%=syllabus.user.show_name %> 课程性质 <%=syllabus.syllabus_type_str %> 课程性质 <%=syllabus.syllabus_type_str %> 学分 <%=syllabus.credit %>学分 学分 <%=syllabus.credit %>学分 总学时 <%=syllabus.hours %>学时 总学时 <%=syllabus.hours %>学时 理论学时 <%=syllabus.theory_hours %>学时 理论学时 <%=syllabus.theory_hours %>学时 实践学时 <%=syllabus.practice_hours %>学时 实践学时 <%=syllabus.practice_hours %>学时 适用专业 <%=syllabus.applicable_major %> 适用专业 <%=syllabus.applicable_major %> 先修课程 <%=syllabus.pre_course %> 先修课程 <%=syllabus.pre_course %>
<%= labelled_form_for @work,:html => { :multipart => true },:remote=>true do |f|%>
-
- 提示：作品名称和描述中不要出现真实的姓名信息
-
+ <% if @homework.anonymous_comment == 0 %>
+
+ 提示：作品名称和描述中不要出现真实的姓名信息
+
+ <% end %>
<% if @homework.homework_type == 3 %>
<%=@homework.homework_detail_group.min_num %>
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index dfddea306..ec028c743 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -235,9 +235,11 @@
:action => 'create',
:homework => @homework.id
},:remote=>true ) do |f| %>
-
- 提示：作品名称和描述中不要出现真实的姓名信息
-
+ <% if @homework.anonymous_comment == 0 %>
+
+ 提示：作品名称和描述中不要出现真实的姓名信息
+
+ <% end %>
<% if @homework.homework_type == 3 %>
<%=@homework.homework_detail_group.min_num %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index ded407f8c..1b55b08f6 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -135,9 +135,9 @@
<% if activity.student_works.has_committed.count != 0 %>
- <% sw = activity.student_works.has_committed.reorder("created_at desc").first %>
+ <% sw = activity.student_works.has_committed.reorder("commit_time desc").first %>
- # <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
+ # <%=time_from_now sw.commit_time %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
<% end %>
diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
index 6ce635a9b..6d09f6896 100644
--- a/app/views/users/_user_group_attr.html.erb
+++ b/app/views/users/_user_group_attr.html.erb
@@ -24,11 +24,4 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 990a193cc..3f73f3b9d 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -146,9 +146,9 @@
<% if homework_common.student_works.has_committed.count != 0 %>
- <% sw = homework_common.student_works.has_committed.reorder("created_at desc").first %>
+ <% sw = homework_common.student_works.has_committed.reorder("commit_time desc").first %>
- # <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
+ # <%=time_from_now sw.commit_time %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
<% end %>
@@ -302,7 +302,7 @@
<% count=homework_common.journals_for_messages.count %>
- <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => homework_common, :user_activity_id => -1, :is_in_course => is_in_course,:course_activity=>-1} %>
+ <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => homework_common, :user_activity_id => homework_common.id, :is_in_course => is_in_course,:course_activity=>-1} %>
<% comments = homework_common.journals_for_messages.reorder("created_on desc").limit(3) %>
<% if count > 0 %>
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 3f6836614..99b9812cc 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -10,6 +10,9 @@
} else {
$("#anonymous_comment").attr('checked',false);
}
+ if($.trim($("#base_on_project").val()) == 1) {
+ $("#base_on_project").attr('checked','checked');
+ }
<% if edit_mode && homework.is_program_homework? %>
$("#BluePopupBox a.BlueCirBtn").click();
<% end %>
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index fb7abdd01..47bdc9126 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -27,9 +27,19 @@
<%# end %>
<%= l(:label_no_data) %>
+
+
+
+
+ <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%>
+
+
+
+
- <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-
-
diff --git a/db/migrate/20160810080942_add_commit_time_to_student_work.rb b/db/migrate/20160810080942_add_commit_time_to_student_work.rb
new file mode 100644
index 000000000..2301d7db8
--- /dev/null
+++ b/db/migrate/20160810080942_add_commit_time_to_student_work.rb
@@ -0,0 +1,16 @@
+class AddCommitTimeToStudentWork < ActiveRecord::Migration
+ def change
+ add_column :student_works, :commit_time, :datetime
+
+ count = StudentWork.all.count / 30 + 2
+ transaction do
+ for i in 1 ... count do i
+ StudentWork.page(i).per(30).each do |work|
+ if work.work_status != 0
+ work.update_column("commit_time", work.created_at)
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 632e4ab49..504fea3cb 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1552,7 +1552,10 @@ function pop_box_new(value, Width, Height){
document.onmousemove = null;
}
- new Drag("popupWrap");
+ $(".sy_popup_con").mousedown(function(event){
+ event.stopPropagation();
+ new Drag("popupWrap");
+ });
}
// 公共提示弹框样式