From 9d65d61f2a0ee70324b7c21b09e990827b88375d Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 8 Oct 2016 15:56:43 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=95=99=E5=B8=88=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=E4=B8=AD=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E6=95=99=E5=B8=88?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=BA=94=E6=9C=89=E4=B8=8A=E7=A7=BB=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/syllabuses/_syllabus_member_list.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/syllabuses/_syllabus_member_list.html.erb b/app/views/syllabuses/_syllabus_member_list.html.erb index 84bbe1d01..97a500f56 100644 --- a/app/views/syllabuses/_syllabus_member_list.html.erb +++ b/app/views/syllabuses/_syllabus_member_list.html.erb @@ -42,7 +42,9 @@ <% else %> 删除 <% end %> - <% if i != 0 && i < count - 1 %> + <% if i == 0 && count == 1 %> +   + <% elsif i != 0 && i < count - 1 %> <%= link_to('下移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'down'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '下移') %> <%= link_to('上移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'up'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '上移') %> <% elsif i < count - 1 %> From 30e6bd6d0ed1931cc6751017bed3fe4cb1970a4b Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 8 Oct 2016 16:04:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=9C=8B=E4=BB=96=E4=BA=BA=E7=9A=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8500=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users_new.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 6f70353e3..2f3ef2928 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -166,13 +166,13 @@ <% else%>
- + TA的课程 (<%=@user.courses.visible.count%>)
- + TA的项目 (<%=@user.projects.visible.count%>) From ed05880653087eaff880de8921aa9f2c95145319 Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 8 Oct 2016 16:22:37 +0800 Subject: [PATCH 3/6] =?UTF-8?q?https=E7=9A=84=E9=93=BE=E6=8E=A5=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/syllabuses/show.html.erb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb index d3398234a..b6c32f125 100644 --- a/app/views/syllabuses/show.html.erb +++ b/app/views/syllabuses/show.html.erb @@ -5,6 +5,14 @@ $(function() { sd_create_editor_from_data(<%= @syllabus.id %>, null, "100%", "<%= @syllabus.class.to_s %>"); showNormalImage('syllabus_description_<%= @syllabus.id %>'); + $("#syllabus_description_<%= @syllabus.id%> p,#syllabus_description_<%= @syllabus.id%> span,#syllabus_description_<%= @syllabus.id%> em").each(function(){ + var postContent = $(this).html(); + postContent = postContent.replace(/ /g," "); + postContent= postContent.replace(/ {2}/g,"  "); + postContent=postContent.replace(/   /g,"   "); + postContent=postContent.replace(/  /g,"   "); + $(this).html(postContent); + }); autoUrl('syllabus_description_<%= @syllabus.id %>'); }); From 277c1468dd4a6c0c2e81e0cb3bae8e9fd1320b74 Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 8 Oct 2016 16:41:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/courses_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index b97fa1a64..69864f226 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -418,7 +418,7 @@ class CoursesService course.send(:safe_attributes=, params[:course], current_user) #course.safe_attributes = params[:course] #course.password = params[:course][:password] - course.syllabus_id = params[:syllabus_id].to_i + #course.syllabus_id = params[:syllabus_id].to_i course.time = params[:time] course.term = params[:term] course.end_time = params[:end_time] From 4aca50e62d8c405aca9f22570d93d7c9c2a3a16e Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 8 Oct 2016 16:46:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E5=8F=AF=E4=BB=A5=E7=BB=99=E8=AF=BE=E7=A8=8B=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=99=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/syllabuses/members.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/syllabuses/members.html.erb b/app/views/syllabuses/members.html.erb index 456845400..2eb560116 100644 --- a/app/views/syllabuses/members.html.erb +++ b/app/views/syllabuses/members.html.erb @@ -13,11 +13,11 @@
<%= render :partial => 'syllabus_member_list' %> - <% if User.current == @syllabus.user %> + <% if User.current == @syllabus.user || User.current.admin? %> 添加成员 <% end %>
- <% if User.current == @syllabus.user %> + <% if User.current == @syllabus.user || User.current.admin? %>