Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/admin_controller.rb

@@ -354,7 +354,7 @@ class AdminController < ApplicationController
     @schools = School.where('1=1')
     end
     @school_count = @schools.count
-    @school_pages = Paginator.new @school_count, per_page_option, params['page'] || 1
+    @school_pages = Paginator.new @school_count, 100, params['page'] || 1
     @schools = paginateHelper @schools,100
     respond_to do |format|
       format.html

app/controllers/courses_controller.rb

@@ -31,17 +31,17 @@ class CoursesController < ApplicationController
 
   def join
     if User.current.logged?
-      if params[:role] == 10
+     # if params[:role] == 10
         cs = CoursesService.new
         @user = User.current
-        join = cs.join_course params,user
+        join = cs.join_course params,@user
         @state = join[:state]
         @course = join[:course]
-      else
-        @course = Course.find_by_id params[:object_id]
-        CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')
-        @state = 6
-      end
+      # else
+      #   @course = Course.find_by_id params[:object_id]
+      #   CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')
+      #   @state = 6
+      # end
     else
       @state = 5 #未登录
     end

app/services/courses_service.rb

@@ -300,6 +300,7 @@ class CoursesService
   #@state == 4 您加入的课程不存在
   #@state == 5 您还未登录
   #@state == 6 申请成功，请等待审核完毕
+  #@state == 7 您已经发送过申请了，请耐心等待
   #@state 其他 未知错误，请稍后再试
   def join_course params,current_user
     course = Course.find_by_id params[:object_id]
@@ -308,15 +309,38 @@ class CoursesService
       if course_endTime_timeout? course
         @state = 2
       else
-        if current_user.member_of_course?(course)
+        if current_user.member_of_course?(course) #如果已经是成员
+          if params[:course_password] == course.password
+            #如果加入角色为学生
+            if params[:role] == "10"
+              @state = 3
+            elsif current_user.allowed_to?(:as_teacher,course)
               @state = 3
+            else
+              #如果加入角色为教师或者教辅
+              CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
+              @state = 6
+            end
+          else
+            @state = 1
+          end
         else
           if params[:course_password] == course.password
+            if params[:role] == "10"
               members = []
               members << Member.new(:role_ids => [10], :user_id => current_user.id)
               course.members << members
               StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
               @state = 0
+            else
+              #如果已经发送过消息了，那么就要给个提示
+              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
+                @state = 7
+              else
+                CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
+                @state = 6
+              end
+            end
           else
             @state = 1
           end

app/views/courses/join.js.erb

@@ -1,25 +1,29 @@
-<% if @object_id && @state != 6%>
+<% if @object_id && @state != 6 && @state !=4 %>
 $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(@course, @user)) %>");
 <% end %>
 <% if @state %>
 <% if @state == 0 %>
 alert("加入成功");
 hideModal($("#popbox02"));
-$("#try_join_course_link").replaceWith("<a href='<%=url_for(:controller => 'homework_common', :action => 'index',:course=>course.id, :host=>Setting.host_course)%>' target='_blank' class='blue_n_btn fr mt20'>提交作品</a>");
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= course.id%>"
+$("#try_join_course_link").replaceWith("<a href='<%=url_for(:controller => 'homework_common', :action => 'index',:course=>@course.id, :host=>Setting.host_course)%>' target='_blank' class='blue_n_btn fr mt20'>提交作品</a>");
+window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 1 %>
 alert("密码错误");
 <% elsif @state == 2 %>
 alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)");
 <% elsif @state == 3 %>
 alert("您已经加入了课程");
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= course.id%>"
+window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 4 %>
 alert("您加入的课程不存在");
 <% elsif @state == 5 %>
 alert("您还未登录");
 <% elsif @state == 6 %>
 alert("申请成功，请等待审核")
+hideModal($("#popbox02"));
+<% elsif @state == 7%>
+  alert("您已经发送过申请了，请耐心等待")
+  hideModal($("#popbox02"));
 <% else %>
 alert("未知错误，请稍后再试");
 <% end %>

app/views/student_work/index.html.erb

@@ -139,6 +139,10 @@
         <div id="homeworkDetailShow" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
         <div id="homeworkDetailHide" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
         <div class="cl"></div>
+        <div>
+          <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => @homework.attachments} %>
+          <div class="cl"></div>
+        </div>
         <div class="mt5">
           <div class="fontGrey2 db fl">截止时间：<%= @homework.end_time %></div>
           <% if @homework.homework_detail_manual%>

app/views/users/_show_user_resource.html.erb

@@ -16,6 +16,19 @@
             $(this).addClass("referenceTypeActive");
         });
     });
+
+// 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
+function store_seleted_resource(dom){
+    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()
+        )
+    }
+}
 </script>
 <!--<div class="referenceResourcesPopup">-->
   <div>

app/views/users/import_resources_to_homework.js.erb

@@ -1,13 +1,13 @@
 <% unless @attachments.empty?%>
-    <% @attachments.each_with_index do |attachment, i| %>
+    <% @attachments.each do |attachment| %>
     $("#attachments_fields").append(
-    '<span id="attachments_p<%= i %>">'+
-    '<%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => "filename link_file", :readonly=>"readonly")%>'+
-    '<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => "description", :style=>"display: inline-block;") %>'+
+    '<span id="attachments_p<%= attachment.id %>">'+
+    '<%= text_field_tag("attachments[p#{attachment.id}][filename]", attachment.filename, :class => "filename link_file", :readonly=>"readonly")%>'+
+    '<%= text_field_tag("attachments[p#{attachment.id}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => "description", :style=>"display: inline-block;") %>'+
         '<span class="ispublic-label"><%= l(:field_is_public)%>:</span>'+
-    '<%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => "is_public")%>'+
-    '<%= link_to("&nbsp;".html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => "js"), :method => "delete", :remote => true, :class => "remove-upload") unless attachment.id.nil? %>'+
-    '<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>'+
+    '<%= check_box_tag("attachments[p#{attachment.id}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => "is_public")%>'+
+    '<%= link_to("&nbsp;".html_safe, attachment_path(attachment, :attachment_id => "p#{attachment.id}", :format => "js"), :method => "delete", :remote => true, :class => "remove-upload") unless attachment.id.nil? %>'+
+    '<%= hidden_field_tag "attachments[p#{attachment.id}][token]", "#{attachment.token}" %>'+
     '</span>'+
     '<div class="cl"></div>')
 

public/stylesheets/courses.css

@@ -1045,6 +1045,8 @@ a.pro_mes_w{ height:20px; display:block; color:#999999;}
 .rside_work_con{ width:650px;}
 a.c_grey{ color:#999999;}
 a:hover.c_grey{ color:#333;}
+a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
+a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .last_time{width:auto; text-align:right; margin-right:70px;}
 .link_file_box{ width:360px;}