<%= title_for_message(params[:type]) %>
-
-
-
+
-
-
-
-
- <%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %> -
- <%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %> -
- <%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %> - -
- 课程消息 -
- <%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %> -
- <%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey" %> -
- <%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey" %> -
- <%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey" %> +
- 课程消息 +
- <%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "homepagePostTypeAssignment postTypeGrey" %> +
- <%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "homepagePostTypeForum postTypeGrey" %> +
- <%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "homepagePostTypeNotice postTypeGrey" %> +
- <%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "homepagePostTypeQuiz postTypeGrey" %>
-
+
-
-
-
-
- 项目消息 -
- <%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey" %> -
- <%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey" %> -
- <%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey" %> -
- <%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %> - -
- 其他 -
- <%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey" %> - <%# 系统贴吧 %> -
- <%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey" %> +
- 项目消息 +
- <%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "homepageTypePTask postTypeGrey" %> +
- <%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "homepagePostTypeForum postTypeGrey" %> +
- <%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "homepageTypePNews postTypeGrey" %> +
- <%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "homepageTypeUApply postTypeGrey" %>
-
+
+
+
+ -
+
-
+
- 更多 +
- <%= link_to "全部",user_message_path(User.current), :class => "resourcesTypeAll postTypeGrey" %> +
- <%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "homepageTypeUnread postTypeGrey" %> +
- <%= link_to "系统消息", user_system_messages_path(User.current), :class => "homepageTypeSystem postTypeGrey" %> +
- <%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "homepageTypePost postTypeGrey" %> +
- <%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "homepageTypeUMessage postTypeGrey" %> +
+
-
-
-
+
- + value="<%= attach.id%>" class="resourcesCheckbox" /> + +
- + + <%= link_to truncate(attach.filename,:length=>30), download_named_attachment_path(attach.id, attach.filename), + :title => attach.filename,:class=>'resourcesBlack'%> + +
- <%= number_to_human_size(attach.filesize) %> +
- <%= get_resource_type(attach.container_type)%> +
- <%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %> + +
- <%= format_date(attach.created_on) %> + +
- <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
+ <%= render :partial => 'homework_ref_resources_list' ,:locals=>{ :attachments => @attachments,:seleted_resources=>seleted_resources} %>
-
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 7b212101c..4ae0e8341 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -7,6 +7,20 @@
homework_description_editor.html("");
$("#homework_editor").toggle();
}
+
+ // 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
+ function store_seleted_resource(dom){
+ console.log(dom.attr('checked'))
+ if(dom.attr('checked') == 'checked' ){
+ $.get(
+ '<%= store_selected_resource_user_path %>'+'?save=y&res_id='+dom.val()
+ )
+ }else {
+ $.get(
+ '<%= store_selected_resource_user_path %>'+'?save=n&res_id='+dom.val()
+ )
+ }
+ }
- <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %> -
- <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>">发布的作业： +
- <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + '老师', + user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师" %> + ">发布的作业：
-
<%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
From 1c72d59f71575666f29a303ab65107f05e2440d1 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 13 Oct 2015 09:25:52 +0800
Subject: [PATCH 10/16] =?UTF-8?q?forum=20tag=E5=8F=8C=E5=87=BB=E5=8F=AF?=
=?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E5=87=BD=E6=95=B0=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=BC=96=E8=BE=91=E5=99=A8=E5=9C=A8?=
=?UTF-8?q?=E7=81=AB=E7=8B=90=E6=B5=8F=E8=A7=88=E5=99=A8=E6=8F=92=E5=85=A5?=
=?UTF-8?q?=E5=9B=BE=E7=89=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/forums/_forum_tag_list.html.erb | 2 +-
app/views/layouts/base_forums.html.erb | 33 ++++++++++++++++++-----
2 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/app/views/forums/_forum_tag_list.html.erb b/app/views/forums/_forum_tag_list.html.erb
index b074cbca3..eebb5adfa 100644
--- a/app/views/forums/_forum_tag_list.html.erb
+++ b/app/views/forums/_forum_tag_list.html.erb
@@ -1,6 +1,6 @@
<% forum.tag_list.each do |tag|%>
- <%= tag %>
+ <%= tag %>
<%if forum.creator.id == User.current.id%>
×
<% end %>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 8677bc705..d32fbf4ed 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -98,13 +98,8 @@
domEle.parent().css("border","1px solid #ffffff");
$("#renameTagName").focus();
}
- //监听所有的单击事件
- $(document).click(function(e){
- node = document.elementFromPoint(e.clientX, e.clientY);
- if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
- return;
- }
- if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
+ $("#renameTagName").live('blur',function(){
+ if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
if($("#renameTagName").val().trim() == tagName){ //如果值一样，则恢复原来的状态
ele.parent().css("border","");
ele.parent().html(tagNameHtml);
@@ -122,6 +117,30 @@
}
}
});
+ //监听所有的单击事件
+// $(document).click(function(e){
+// node = document.elementFromPoint(e.clientX, e.clientY);
+// if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
+// return;
+// }
+// if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
+// if($("#renameTagName").val().trim() == tagName){ //如果值一样，则恢复原来的状态
+// ele.parent().css("border","");
+// ele.parent().html(tagNameHtml);
+//
+// }else{ //否则就要更新tag名称了
+// if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){
+// $.post(
+// '<%#= update_tag_name_path %>',
+// {"taggableId": taggableId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim()}
+// )
+// }else{
+// ele.parent().css("border","");
+// ele.parent().html(tagNameHtml);
+// }
+// }
+// }
+// });
function del_forum_confirm(){
if(confirm('您确定要删除么?')){
From 71c55667ac549a65288826fa8b26ec95493f42c4 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 13 Oct 2015 09:37:30 +0800
Subject: [PATCH 11/16] =?UTF-8?q?forum=20tag=E5=8F=8C=E5=87=BB=E5=8F=AF?=
=?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E5=87=BD=E6=95=B0=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=BC=96=E8=BE=91=E5=99=A8=E5=9C=A8?=
=?UTF-8?q?=E7=81=AB=E7=8B=90=E6=B5=8F=E8=A7=88=E5=99=A8=E6=8F=92=E5=85=A5?=
=?UTF-8?q?=E5=9B=BE=E7=89=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/forums/_forum_tag_list.html.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/forums/_forum_tag_list.html.erb b/app/views/forums/_forum_tag_list.html.erb
index eebb5adfa..1cae58619 100644
--- a/app/views/forums/_forum_tag_list.html.erb
+++ b/app/views/forums/_forum_tag_list.html.erb
@@ -1,4 +1,4 @@
-<% forum.tag_list.each do |tag|%>
+<% forum.reload.tag_list.each do |tag|%>
<%= tag %>
<%if forum.creator.id == User.current.id%>
From 26e0f7db0bda202fd017b5851405c70234af30ba Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 13 Oct 2015 15:48:44 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E6=98=AF=E8=80=81=E5=B8=88=EF=BC=8C?=
=?UTF-8?q?=E5=B0=B1=E9=83=BD=E8=83=BD=E7=BC=96=E8=BE=91=EF=BC=8C=E6=9C=89?=
=?UTF-8?q?id=EF=BC=8C=E5=B0=B1=E6=98=AF=E5=8F=AA=E8=83=BD=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=E8=B5=84=E6=BA=90=E9=87=8C=E7=9A=84tag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/files/index.html.erb | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 656baaf63..782efbb22 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -234,21 +234,23 @@
//第二种是改变某个tag名称。其他所有的资源如果拥有这个tag。那么对应的tag名也要改掉。
//目前这两种依据 的来源就是 是否 传了参数 id。如果有id。就指定了资源id，就是第一种情况。如果没有id。就是第二种情况
function rename_tag(domEle,name,id,type){
- isdb = true; //这是双击
- //clearTimeout(clickFunction);
- if(domEle.children().get(0) != undefined ){ //已经是编辑框的情况下不要动
- return;
+ if(String(id) != '' || '<%=User.current.allowed_to?(:as_teacher,@course)%>' == 'true' ) { //如果有id ，或者是老师就都能编辑，否则，没有id，不是老师就不能编辑
+ isdb = true; //这是双击
+ //clearTimeout(clickFunction);
+ if (domEle.children().get(0) != undefined) { //已经是编辑框的情况下不要动
+ return;
+ }
+ tagNameHtml = domEle.parent().html()
+ tagName = name;
+ parentCssBorder = domEle.parent().css("border");
+ ele = domEle;
+ tagId = id;
+ taggableType = type;
+ width = parseInt(domEle.css('width').replace('px', '')) >= 100 ? parseInt(domEle.css('width').replace('px', '')) : 100
+ domEle.html('');
+ domEle.parent().css("border", "1px solid #ffffff");
+ $("#renameTagName").focus();
}
- tagNameHtml = domEle.parent().html()
- tagName = name;
- parentCssBorder = domEle.parent().css("border");
- ele = domEle;
- tagId = id;
- taggableType = type;
- width = parseInt(domEle.css('width').replace('px','')) >=100 ? parseInt(domEle.css('width').replace('px','')) : 100
- domEle.html('');
- domEle.parent().css("border","1px solid #ffffff");
- $("#renameTagName").focus();
}
//监听所有的单击事件
$(function(){
From c9b23c55976e34e1c3db61227a28ab6486c5fb15 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 13 Oct 2015 15:59:02 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E8=B4=B4=E5=90=A7=20=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E7=AC=A6=E5=8F=B7=20=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/stylesheets/nyan.css | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index b64e60831..b476210b1 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -724,6 +724,10 @@ div.actions input[type="text"] {
word-wrap: break-word;
}
+.memo-content li {
+ list-style-type: decimal;
+}
+
.memo-timestamp {
position: absolute;
bottom: 0px;
From 2d6055504158b9d801c9c172958c89daf15acbab Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 13 Oct 2015 16:06:36 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E5=8D=95=E4=B8=AA=E5=B8=96=E5=AD=90?=
=?UTF-8?q?=E7=9A=84=E5=9B=9E=E5=A4=8D=E5=85=A8=E9=83=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/memos/show.html.erb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 4224d0987..d6acabd9e 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -86,15 +86,15 @@
回复（<%=@reply_count %>）-- <% if @reply_count > 2%> - 点击展开更多回复 - <% end %> -+ + + + +<% @replies.each_with_index do |reply,i| %> -+<%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>From 5b2fb6646863943e5990fd4298f4f1cee4cb9915 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 13 Oct 2015 16:29:25 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3ie11=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E4=B9=B1=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a6554075f..86c220bd2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -756,7 +756,7 @@ class ApplicationController < ActionController::Base # Returns a string that can be used as filename value in Content-Disposition header def filename_for_content_disposition(name) - request.env['HTTP_USER_AGENT'] =~ %r{MSIE} ? ERB::Util.url_encode(name) : name + request.env['HTTP_USER_AGENT'] =~ %r{MSIE|Trident} ? ERB::Util.url_encode(name) : name end def api_request? From a227e3759851040c87ba2668c4c9e539cd19aeef Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 13 Oct 2015 17:03:40 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8E=89=E8=B4=B4?= =?UTF-8?q?=E5=90=A7=E5=AD=97=E7=AC=A6=E9=95=BF=E5=BA=A6=E7=9A=84=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 8 ++++---- app/views/memos/edit.html.erb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 714d364a4..8314c3902 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -76,10 +76,10 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } - if(memo_content.html().trim().length > 5000){ - $("#error").html("内容 过长（最长为 5000 个字符）").show(); - return false; - } +// if(memo_content.html().trim().length > 5000){ +// $("#error").html("内容 过长（最长为 5000 个字符）").show(); +// return false; +// } return true; } diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index 1ac86cf55..7ab460555 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -7,10 +7,10 @@ $("#error").html('主题不能超过50个字符').show(); return; } - if(memo_content.html().trim().length > 5000 ){ - $("#error").html('内容不能超过5000个字符').show(); - return; - } +// if(memo_content.html().trim().length > 5000 ){ +// $("#error").html('内容不能超过5000个字符').show(); +// return; +// } memo_content.sync(); $("#edit_memo").submit(); }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){
作业
diff --git a/app/views/users/user_import_resource.js.erb b/app/views/users/user_import_resource.js.erb
index 0e35acd95..87324669e 100644
--- a/app/views/users/user_import_resource.js.erb
+++ b/app/views/users/user_import_resource.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user,:homework_id=>@homework_id}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user,:homework_id=>@homework_id,:seleted_resources=>@seleted_resources}) %>');
showModal('ajax-modal', '730px');
$('#ajax-modal').css('height','500px').css("width","730px");
$('#ajax-modal').siblings().remove();
diff --git a/app/views/users/user_ref_resource_search.js.erb b/app/views/users/user_ref_resource_search.js.erb
index 52f54bee4..8651768a5 100644
--- a/app/views/users/user_ref_resource_search.js.erb
+++ b/app/views/users/user_ref_resource_search.js.erb
@@ -1,2 +1,2 @@
-$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'resources_list',:locals=>{:attachments => @attachments})%>');
+$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'homework_ref_resources_list',:locals=>{:attachments => @attachments,:seleted_resources=>@seleted_resources})%>');
$("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
\ No newline at end of file
diff --git a/app/views/users/user_resource_type.js.erb b/app/views/users/user_resource_type.js.erb
index 52f54bee4..8651768a5 100644
--- a/app/views/users/user_resource_type.js.erb
+++ b/app/views/users/user_resource_type.js.erb
@@ -1,2 +1,2 @@
-$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'resources_list',:locals=>{:attachments => @attachments})%>');
+$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'homework_ref_resources_list',:locals=>{:attachments => @attachments,:seleted_resources=>@seleted_resources})%>');
$("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index d6c36212a..2e02cd3d2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -386,6 +386,7 @@ RedmineApp::Application.routes.draw do
get 'user_resource_type'
get 'user_ref_resource_search'
post 'import_resources_to_homework'
+ get 'store_selected_resource'
# end
end
end
From d33a6b763d6a6e608e96f41627f149e8f5a0375d Mon Sep 17 00:00:00 2001
From: Tim 
");
$('#ajax-modal').parent().css("top","30%").css("left","20%").css("position","fixed");
}
+
+ // 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
+ function store_seleted_resource(dom){
+ console.log(dom.attr('checked'))
+ if(dom.attr('checked') == 'checked' ){
+ $.get(
+ '<%= store_selected_resource_user_path(User.current) %>'+'?save=y&res_id='+dom.val()
+ )
+ }else {
+ $.get(
+ '<%= store_selected_resource_user_path(User.current) %>'+'?save=n&res_id='+dom.val()
+ )
+ }
+ }
From f024723f8c6fb3548f8a83596812339ffd7fc35a Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 12 Oct 2015 16:28:18 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E5=8E=BB=E6=8E=89js=E7=9A=84=E8=B0=83?=
=?UTF-8?q?=E8=AF=95=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/student_work/new.html.erb | 1 -
app/views/users/user_homeworks.html.erb | 1 -
2 files changed, 2 deletions(-)
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 6cf168f8e..09544d004 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -24,7 +24,6 @@
// 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
function store_seleted_resource(dom){
- console.log(dom.attr('checked'))
if(dom.attr('checked') == 'checked' ){
$.get(
'<%= store_selected_resource_user_path(User.current) %>'+'?save=y&res_id='+dom.val()
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 4ae0e8341..8b9f4cb0a 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -10,7 +10,6 @@
// 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
function store_seleted_resource(dom){
- console.log(dom.attr('checked'))
if(dom.attr('checked') == 'checked' ){
$.get(
'<%= store_selected_resource_user_path %>'+'?save=y&res_id='+dom.val()
From 57475f3420fc8a28be8db1d29080f31b5e9c45f0 Mon Sep 17 00:00:00 2001
From: ouyangxuhua
Date: Mon, 12 Oct 2015 16:46:40 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E5=BF=AB=E5=88=B0=E6=97=B6=EF=BC=8C=E7=94=B1?=
=?UTF-8?q?=E2=80=9C=E6=9F=90=E7=94=A8=E6=88=B7=E5=8F=91=E5=B8=83=E7=9A=84?=
=?UTF-8?q?=E4=BD=9C=E4=B8=9A=E2=80=9D=EF=BC=8C=E6=94=B9=E4=B8=BA=E2=80=9C?=
=?UTF-8?q?=E6=9F=90=E8=80=81=E5=B8=88=E5=8F=91=E5=B8=83=E7=9A=84=E4=BD=9C?=
=?UTF-8?q?=E4=B8=9A=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/users/_user_message_course.html.erb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 07066f6dc..1b9b175ea 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -84,7 +84,9 @@
<% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>