Merge remote-tracking branch 'origin/develop' into weixin_guange

app/api/mobile/apis/activities.rb

@@ -13,34 +13,18 @@ module Mobile
         end
         post do
           user = UserWechat.find_by_openid(params[:openid]).user
-=begin
-          shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
-          shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
-          page = params[:page] ? params[:page] : 0
-          user_project_ids = (user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
-          user_course_ids = (user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")"
-          course_types = "('Message','News','HomeworkCommon','Poll','Course')"
-          project_types = "('Message','Issue','ProjectCreateInfo')"
-          principal_types = "JournalsForMessage"
-
-          blog_ids = "("+user.blog.id.to_s+","+((User.watched_by(user.id).count == 0 )? '0' :User.watched_by(user.id).map{|u| u.blog.id}.join(','))+")"
-          activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-                                              "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
-                                              "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{user.id}) " +
-                                              "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc')
-=end
 
           shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
           shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
           page = params[:page] ? params[:page] : 0
-          user_project_ids = (user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.map{|project| project.id}-shield_project_ids).join(",") + ")"
+          user_project_ids = (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).join(",") + ")"
-          user_course_ids = (user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.map{|course| course.id}-shield_course_ids).join(",") + ")"
+          user_course_ids = (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
           course_types = "('Message','News','HomeworkCommon','Poll','Course')"
           project_types = "('Message','Issue','Project')"
           principal_types = "JournalsForMessage"
           watched_user_ids = User.watched_by(user.id).count == 0 ? " " : ("," + User.watched_by(user.id).map{|u| u.id.to_s }.join(','))
           user_ids = "(" + user.id.to_s + watched_user_ids + ")"
-          watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
+          watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").count == 0 ? " " :Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
           blog_ids = "(" + watched_user_blog_ids + ")"
 
           activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +

app/controllers/zipdown_controller.rb

@@ -10,14 +10,14 @@ class ZipdownController < ApplicationController
   #勿删 before_filter :authorize, :only => [:assort,:download_user_homework]
   SAVE_FOLDER = "#{Rails.root}/files"
   OUTPUT_FOLDER = "#{Rails.root}/files/archiveZip"
+  MAX_PATH = 50
 
   #统一下载功能 
   def download
     if User.current.logged?
       begin
         if params[:base64file]
-          file = Base64.decode64(params[:base64file])
+          file = decode64(params[:base64file])
-          file = file.sub('*', '+')
           send_file "#{OUTPUT_FOLDER}/#{file}", :filename => filename_for_content_disposition(file), :type => detect_content_type(file)
         else
           send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => filename_for_content_disposition(params[:filename]), :type => detect_content_type(params[:file])
@@ -125,7 +125,11 @@ class ZipdownController < ApplicationController
   end
 
   def encode64(str)
-    Base64.encode64(str).sub('+', '*')
+    Base64.urlsafe_encode64(str)
+  end
+
+  def decode64(str)
+    Base64.urlsafe_decode64(str)
   end
 
   def zip_homework_common homework_common
@@ -242,6 +246,12 @@ class ZipdownController < ApplicationController
 
   def zipping(zip_name_refer, files_paths, output_path, is_attachment=false, not_exist_file=[])
     rename_zipfile = zip_name_refer ||= "#{Time.now.to_i.to_s}.zip"
+    # 文件名过长
+
+    if rename_zipfile.size > MAX_PATH
+      rename_zipfile = rename_zipfile[0,rename_zipfile.size-4][0,MAX_PATH-4] + rename_zipfile[-4,4]
+    end
+
     zipfile_name = "#{output_path}/#{rename_zipfile}"
 
     Dir.mkdir(File.dirname(zipfile_name)) unless File.exist?(File.dirname(zipfile_name))

app/views/courses/_new_member_list.html.erb

@@ -51,17 +51,9 @@
               <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32))  %>
             </a>
             <ul>
-              <% if @canShowCode %>
+              <li>
-                  <li>
+                <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
-                    <% if member.user.show_name == ''%>
+              </li>
-                        <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.name}</span>".html_safe,user_path(member.user)) %>
-                    <% else%>
-                        <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
-                    <%end%>
-                  </li>
-              <% else %>
-                  <li><%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.name}</span>".html_safe, user_path(member.user)) %></li>
-              <% end %>
               <br/>
               <% unless member.user.user_extensions.student_id == ''%>
                   <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span >#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>

app/views/layouts/base_courses.html.erb

@@ -157,9 +157,9 @@
           </div>
         </div>
         <div class="lg-foot" id="lg-foot" onclick="show_more_msg();">
-          <%= l(:label_expend_information)%>
+          <label id="expend_more_information"  value="show_more"><%= l(:label_expend_information)%></label>
           <span class="g-arr-down">
-            <img src="/images/jiantou.jpg" width="12" height="6" />
+            <img id="arrow" src="/images/jiantou.jpg" width="12" height="6" />
           </span>
         </div>
       </div><!--项目简介 end-->

public/assets/wechat/activities.html

@@ -175,7 +175,7 @@
           </div>
         </div>
 
-        <div ng-if="act.act_type=='ProjectCreateInfo'">
+        <div ng-if="act.act_type=='Project'">
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">

public/javascripts/course.js

@@ -475,6 +475,19 @@ function submitMemberSerch(content)
 function show_more_msg()
 {
     $("#course_description").toggleClass("course_description_none");
+    var information = $("#expend_more_information");
+    var arrow = $("#arrow");
+    var val = information.attr("value");
+    if (val == "show_more") {
+        $("#expend_more_information").text("收起描述信息");
+        information.attr("value", "hide_more");
+        arrow.attr("src", "/images/jiantouup.jpg")
+    }
+    else {
+        $("#expend_more_information").text("展开更多信息");
+        information.attr("value", "show_more");
+        arrow.attr("src", "/images/jiantou.jpg")
+    }
 }
 //作业描述显示更多信息
 function news_show_more_des(id)