Merge branch 'cxt_course' into develop

app/models/user.rb

@@ -42,12 +42,12 @@ class User < Principal
   # Different ways of displaying/sorting users
   USER_FORMATS = {
     :firstname_lastname => {
-        :string => '#{firstname} #{lastname}',
+        :string => '#{firstname}#{lastname}',
         :order => %w(firstname lastname id),
         :setting_order => 1
       },
     :firstname_lastinitial => {
-        :string => '#{firstname} #{lastname.to_s.chars.first}.',
+        :string => '#{firstname}#{lastname.to_s.chars.first}.',
         :order => %w(firstname lastname id),
         :setting_order => 2
       },
@@ -57,7 +57,7 @@ class User < Principal
         :setting_order => 3
       },
     :lastname_firstname => {
-        :string => '#{lastname} #{firstname}',
+        :string => '#{lastname}#{firstname}',
         :order => %w(lastname firstname id),
         :setting_order => 4
       },

app/services/courses_service.rb

@@ -399,6 +399,8 @@ class CoursesService
     if course
       if course_endTime_timeout? course
         @state = 2
+      elsif course[:is_delete] == 1
+        @state = 11
       else
         if current_user.member_of_course?(course) #如果已经是成员
           @state = 3

app/views/admin/_courselist_detail_tr.html.erb

@@ -7,7 +7,7 @@
             </span>
 </td>
 <td align="center">
-  <%= link_to(course.teacher.show_name.truncate(6, omission: '...'), user_path(course.teacher)) %>
+  <%= link_to(course.teacher.show_name, user_path(course.teacher)) %>
 </td>
 <td align="center">
   <%= course.class_period %>

app/views/admin/non_syllabus_courses.html.erb

@@ -72,7 +72,7 @@
             </span>
           </td>
           <td align="center">
-            <%= link_to(course.teacher.show_name.truncate(6, omission: '...'), user_path(course.teacher)) %>
+            <%= link_to(course.teacher.show_name, user_path(course.teacher)) %>
           </td>
           <td align="center">
             <%= course.class_period %>

app/views/admin/syllabuses.html.erb

@@ -52,7 +52,7 @@
           <td class="center">
           </td>
           <td align="center">
-            <%= link_to(syllabus.try(:user).try(:realname).truncate(6, omission: '...'), user_path(syllabus.user)) %>
+            <%= link_to syllabus.user.show_name, user_path(syllabus.user) %>
           </td>
           <td class="center">
             <%= format_date(syllabus.created_at) %>
@@ -70,7 +70,7 @@
                 <%= render :partial => 'admin/rename_course_name', :locals => {:course => course} %>
               </td>
               <td align="center">
-                <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
+                <%= link_to(course.teacher.show_name, user_path(course.teacher)) %>
               </td>
               <td class="center">
                 <%= format_date(course.created_at) %>

app/views/layouts/_course_base_info.html.erb

@@ -3,8 +3,10 @@
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count %>
 <p class="sy_cgrey mb10">
-  <%=link_to @course.syllabus.title, syllabus_path(@course.syllabus_id), :class => 'sy_cgrey' %>
-  &nbsp;&gt;&nbsp;
+  <% if @course.syllabus %>
+      <%=link_to @course.syllabus.title, syllabus_path(@course.syllabus_id), :class => 'sy_cgrey' %>
+      &nbsp;&gt;&nbsp;
+  <% end %>
   <%=link_to @course.name, course_path(@course), :class => 'sy_cgrey' %>
 </p>
 
@@ -61,9 +63,9 @@
   <% is_TE = get_user_member_roles_course @course, User.current, 9 %>
   <% is_ST = get_user_member_roles_course @course, User.current, 10 %>
   <% if !is_teacher && (is_TA || is_TE)  %>
-      <%= link_to '教师身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => (is_TA ? 7 : 9)), :class => "sy_btn_orange mr10 fl" %>
+      <%= link_to '教师身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => (is_TA ? 7 : 9)), :class => "sy_btn_orange mr10 fl", :title => "由学生身份切换至教师身份" %>
   <% elsif is_teacher && is_ST %>
-      <%= link_to '学生身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => (is_TA ? 7 : 9), :tar_role => 10), :class => "sy_btn_orange mr10 fl" %>
+      <%= link_to '学生身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => (is_TA ? 7 : 9), :tar_role => 10), :class => "sy_btn_orange mr10 fl", :title => "由教师身份切换至学生身份" %>
   <% end %>
   <% unless (is_teacher || is_TA || is_TE) %>
       <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>

app/views/users/_join_course_course_message.html.erb

@@ -5,7 +5,7 @@
 </li>
 <li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <a href="javascript:void(0);" class="newsGrey">
-    <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content.include?('9') ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id),
+    <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id),
                 :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
     <!--:onmouseover => "message_titile_show($(this),event)",-->
     <!--:onmouseout => "message_titile_hide($(this))" %>-->

app/views/words/reply_to_syllabus.js.erb

@@ -1,2 +1,2 @@
 $("#reply_banner_<%=@syllabus.id %>").replaceWith("<%=escape_javascript(render :partial => 'users/reply_banner', :locals => {:count => @count, :activity => @syllabus, :user_activity_id => @syllabus.id}) %>");
-$("#reply_div_<%=@syllabus.id %>").html("<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @comments, :type => 'Syllabus'}) %>");
+$("#reply_div_<%=@syllabus.id %>").html("<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @comments, :type => 'Syllabus', :activity_id => @syllabus.id}) %>");