Merge branch 'develop' into weixin_guange

Gemfile

@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
-gem "test-unit", "~>3.0" 
+  gem "test-unit", "~>3.0"
 
 ### profile
-# gem 'oneapm_rpm'
+  gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'

app/controllers/admin_controller.rb

@@ -612,43 +612,44 @@ class AdminController < ApplicationController
     end
   end
 
-  # 获取申请的高校列表
+  # 单位审核
-  # status: 0 未审批； 1 已批阅；
+  # 未审批tab页
+  # status: 0 未审批； 1 已批阅； 2已更改； 3拒绝；
   def applied_schools
     @name = params[:name] || ""
     condition = "#{@name.strip}".gsub(" ","")
 
     @apply_status = ApplyAddSchools.where("status = 0 and name like '%#{condition}%'").order('created_at desc')
     @apply_count = @apply_status.count
-
     @apply_pages = Paginator.new @apply_count, 30, params['page'] || 1
     @apply_status = paginateHelper @apply_status, 30
-
     @page = (params['page'] || 1).to_i - 1
+
     respond_to do |format|
       format.html
     end
   end
 
+  # 单位审核
+  # 已审批tab页
   def has_applied_schools
     @name = params[:name] || ""
     condition = "#{@name.strip}".gsub(" ","")
 
     @has_apply_status = ApplyAddSchools.where("(status = 1 or status = 2) and name like '%#{condition}%'").order('created_at desc')
     @has_apply_count = @has_apply_status.count
-
     @has_apply_pages = Paginator.new @has_apply_count, 30, params['page'] || 1
     @has_apply_status = paginateHelper @has_apply_status, 30
-
     @page = (params['page'] || 1).to_i - 1
+
     respond_to do |format|
       format.html
     end
   end
 
-  # 批准未审批的高校
+  # 单位审核：批准
   # 消息发送,发送对象为申请人
-  # status: 0表示未批准； status：1表示已批准； status： 2表示已更改； status： 3表示已拒绝
+  # status: 0表示未批准； status：1表示已批准； status： 2表示已更改； status： 3表示已拒绝；
   def approve_applied_schools
     applied_school = ApplyAddSchools.find params[:id]
     applied_school.update_column('status', 1) unless applied_school.nil?
@@ -661,7 +662,7 @@ class AdminController < ApplicationController
     end
   end
 
-  # 更改申请的高校名称
+  # 单位审核：更改
   # REDO: 修改该字段
   # REDO: 同步修改使用了改名称的用户单位
   def edit_applied_schools
@@ -676,7 +677,9 @@ class AdminController < ApplicationController
       users.each do |user|
         user.update_column("school_id", school[0].id)
       end
-      aas.school.destroy
+      if aas.school_id != school[0].id.to_i
+        aas.school.destroy
+      end
       aas.update_attribute(:school_id, school[0].id)
     rescue Exception => e
       puts e
@@ -686,8 +689,9 @@ class AdminController < ApplicationController
     redirect_to unapplied_schools_url
   end
 
+  # 单位审核：更改功能搜索合法学校弹框
   def all_schools
-    apply_schools = ApplyAddSchools.where("status != 1")
+    apply_schools = ApplyAddSchools.where("status = 0")
     apply_school_ids = apply_schools.empty? ? "(-1)" : "(" + apply_schools.map{|sc| sc.school_id}.join(',') + ")"
     if !params[:search].nil?
       search = "%#{params[:search].to_s.strip.downcase}%"
@@ -704,22 +708,30 @@ class AdminController < ApplicationController
     end
   end
 
-  # 删除申请的高校
+  # 单位审核：删除
   # REDO: destroy关联删除
   # REDO: 删除确认提示，是否删除
   # REDO: 给申请人发送消息
   def delete_applied_schools
     applied_school = ApplyAddSchools.find(params[:id])
     applied_school.update_attribute(:status, 3)
+    # 未审批删除
+    if params[:tip] == "unapplied"
     AppliedMessage.create(:user_id => applied_school.user_id, :status => 3, :viewed => true, :applied_id => applied_school.id, :applied_type => "ApplyAddSchools", :name => applied_school.name )
+    # 删除学校的用户
     users = UserExtensions.where("school_id = #{applied_school.school_id}")
     users.each do |user|
       user.update_column("school_id", nil)
     end
-    applied_school.school.destroy
+      applied_school.school.destroy
-    if params[:tip] == "unapplied"
       redirect_to unapplied_schools_url
+    # 已审批删除
     elsif params[:tip] == "applied"
+      users = UserExtensions.where("school_id = #{applied_school.school_id}")
+      users.each do |user|
+        user.update_column("school_id", nil)
+      end
+      applied_school.destroy
       redirect_to applied_schools_url
     end
   end

app/controllers/applied_project_controller.rb

@@ -53,12 +53,14 @@ class AppliedProjectController < ApplicationController
     else
       @project = Project.find(params[:project_id])
     end
-    if !@project || params[:invite_code].to_s != @project.invite_code
+    if !@project || params[:invite_code].upcase.to_s != @project.invite_code
       @flag = 1
     elsif User.current.member_of?(@project)
       @flag = 2
     elsif params[:member].nil?
       @flag = 3
+    elsif !AppliedProject.where(:project_id => @project.id, :user_id => User.current.id).first.nil?
+      @flag = 5
     else
       @flag = 4
       role = params[:member] == "member_manager" ? 3 : (params[:member] == "member_developer" ? 4 :5)

app/controllers/members_controller.rb

@@ -75,13 +75,19 @@ class MembersController < ApplicationController
           project.members << members
           project.project_infos << project_info
           project.user_grades << user_grades unless user_grades.first.user_id.nil?
-          @applied_message.update_attribute(:status, 2)
+
+          # 添加成功后所有管理员收到的消息状态都要更新
+          applied_messages = AppliedMessage.where(:applied_id => @applied_message.applied_id, :project_id => @applied_message.project_id, :status => 1,
+                                                    :applied_type => "AppliedProject")
+          applied_messages.update_all(:status => 7, :viewed => true)
+          @applied_message = AppliedMessage.find(params[:applied_message_id])
           # 添加成功后，申请人收到消息
           AppliedMessage.create(:user_id => @applied_message.applied_user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,
-                                  :status => 6, :viewed => true, :applied_user_id => @applied_message.user_id, :role => applied_project.role, :project_id => applied_project.project_id)
+                                  :status => 6, :viewed => false, :applied_user_id => @applied_message.user_id, :role => applied_project.role, :project_id => applied_project.project_id)
+
           # 添加成功后，批准人收到消息
-          AppliedMessage.create(:user_id => @applied_message.user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,
+          # AppliedMessage.create(:user_id => @applied_message.user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,
-                                  :status => 7, :viewed => true, :applied_user_id => @applied_message.applied_user_id, :role => applied_project.role, :project_id => applied_project.project_id)
+          #                         :status => 7, :viewed => true, :applied_user_id => @applied_message.applied_user_id, :role => applied_project.role, :project_id => applied_project.project_id)
         rescue Exception => e
           puts e
         end
@@ -95,14 +101,19 @@ class MembersController < ApplicationController
   # status(1：申请的消息；2：已操作过该消息（包括同意或者拒绝，消息状态更新）；3：拒绝消息；4:被拒人收到消息；5：拒绝者收到消息；6：同意后申请人收到消息；7：同意后批准人收到消息)
   def refused_allow_to_join_project
     @applied_message = AppliedMessage.find(params[:applied_message_id])
-    @applied_message.update_attribute(:status, 3)
+    # @applied_message.update_attribute(:status, 3)
     applied_project = @applied_message.applied
     # 发送消息给被拒者,user_id对应的收到信息的用户
     AppliedMessage.create(:user_id => @applied_message.applied_user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 4,
-                            :viewed => true, :applied_user_id => @applied_message.user_id, :role => applied_project.role, :project_id => applied_project.project_id)
+                            :viewed => false, :applied_user_id => @applied_message.user_id, :role => applied_project.role, :project_id => applied_project.project_id)
-    # 发送消息给拒绝者
+
-    AppliedMessage.create(:user_id => @applied_message.user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 5,
+    # 拒绝功后所有管理员收到的消息状态都要更新
-                            :viewed => true, :applied_user_id => @applied_message.applied_user_id, :role => applied_project.role, :project_id => applied_project.project_id)
+    applied_messages = AppliedMessage.where(:applied_id => @applied_message.applied_id, :project_id => @applied_message.project_id, :status => 1,
+                                              :applied_type => "AppliedProject")
+    applied_messages.update_all(:status => 5, :viewed => true)
+    @applied_message = AppliedMessage.find(params[:applied_message_id])
+    # AppliedMessage.create(:user_id => @applied_message.user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 5,
+    #                         :viewed => true, :applied_user_id => @applied_message.applied_user_id, :role => applied_project.role, :project_id => applied_project.project_id)
     applied_project.delete
   end
 

app/controllers/school_controller.rb

@@ -191,7 +191,7 @@ class SchoolController < ApplicationController
           # status=4 向管理员发送信息
           users = User.where(:admin => 1)
           users.each do |user|
-            AppliedMessage.create(:user_id => user.id, :status => 4, :applied_user_id => User.current.id, :viewed => true, :applied_id => school.id, :applied_type => "ApplyAddSchools", :name => school.name )
+            AppliedMessage.create(:user_id => user.id, :status => 0, :applied_user_id => User.current.id, :viewed => true, :applied_id => school.id, :applied_type => "ApplyAddSchools", :name => school.name )
           end
         else
           data[:result] = 3

app/helpers/users_helper.rb

@@ -80,6 +80,19 @@ module UsersHelper
     # end
   end
 
+  def applied_project_status applied_message
+    case applied_message.status
+      when 4
+        "被拒绝"
+      when 5
+        "您已拒绝"
+      when 6
+        "已通过"
+      when 7
+        "您已同意"
+    end
+  end
+
   # 项目申请消息通过状态判断tip描述
   def applied_project_tip applied_message
     case applied_message.status
@@ -92,6 +105,18 @@ module UsersHelper
     end
   end
 
+  def applied_project_tip_header applied_message
+    case applied_message.status
+      when 4
+        "婉拒您"
+      when 5,3,2,1,7
+        "申请:"
+      when 6
+        "同意您"
+    end
+  end
+
+
   def get_resource_origin attach
     type = attach.container_type
     content = attach.container

app/models/apply_add_schools.rb

@@ -4,13 +4,5 @@ class ApplyAddSchools < ActiveRecord::Base
   has_many :applied_messages, :class_name =>'AppliedMessage', :as => :applied
   belongs_to :school
 
-  after_create :send_massage
+  #after_create :send_massage
-
-  #给系统所有管理发送消息
-  def send_massage
-    users = User.where(:admin => 1)
-    users.each do |user|
-      self.applied_messages << AppliedMessage.new(:user_id => user.id, :viewed => false, :status => false)
-    end
-  end
 end

app/views/admin/applied_schools.html.erb

@@ -29,7 +29,7 @@
       <th style="width: 30px;">
         申请者
       </th>
-      <th style="width: 75px;">
+      <th style="width: 85px;">
         地区
       </th>
       <th style="width: 75px;">
@@ -55,7 +55,7 @@
           </td>
           <td class="name" title='<%=apply.name%>' >
             <span id="apply_title_<%= apply.id %>"><%= apply.name %></span>
-            <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位名称" id="school_name_edit_<%=apply.id%>" onblur="edit_school_name('<%= edit_apply_name_school_path(apply.id)%>','<%= apply.id %>');"><%= apply.name %></textarea>
+            <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位名称" id="school_name_edit_<%=apply.id%>" onblur="edit_school_name('<%= edit_apply_name_school_path(apply.id)%>','<%= apply.id %>');"></textarea>
           </td>
           <td class="center">
             <% user = User.where("id=?", apply.user_id).first %>
@@ -67,7 +67,7 @@
             <span ondblclick = "show_edit_school_province('<%= apply.id %>');" id="apply_province_<%= apply.id %>">
             <%= (apply.province.nil? ? "" : apply.province) + (apply.city.nil? ? "" : apply.city)  %>
             </span>
-            <select onchange="showcity(this.value, document.getElementById('schoolCity_<%=apply.id%>'));edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="province" id="school_province_edit_<%=apply.id%>" class="fl" style="width:50px; height:18px; display: none">
+            <select onchange="showcity(this.value, document.getElementById('schoolCity_<%=apply.id%>'));edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="province" id="school_province_edit_<%=apply.id%>" class="fl" style="width:55px; height:18px; display: none">
               <option value="北京">北京</option>
               <option value="上海">上海</option>
               <option value="广东">广东</option>
@@ -104,7 +104,7 @@
               <option value="台湾">台湾</option>
               <option value="海外">海外</option>
             </select>
-            <select onchange="edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="city" id="schoolCity_<%=apply.id%>" class="fl ml5" style="width:50px; height:18px; display: none"></select>
+            <select onchange="edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="city" id="schoolCity_<%=apply.id%>" class="fl ml5" style="width:55px; height:18px; display: none"></select>
           </td>
           <td class="center">
             <span title="双击可编辑" ondblclick = "show_edit_school_address('<%= apply.id %>');" id="apply_address_<%= apply.id %>"><%= apply.address %></span>

app/views/admin/has_applied_schools.html.erb

@@ -26,7 +26,7 @@
       <th style="width: 80px;">
         单位名称
       </th>
-      <th style="width: 30px;">
+      <th style="width: 35px;">
         申请者
       </th>
       <th style="width: 95px;">
@@ -59,8 +59,8 @@
           <td  class="name" title='<%=apply.name%>' >
             <% unless apply.school_id.nil? %>
                 <% school_name = School.where("id=?", apply.school_id).first %>
-                <span title="双击可编辑" ondblclick = "show_edit_school_name('<%= apply.id %>');" id="apply_title_<%= apply.id %>"><%= school_name %></span>
+                <span title="双击可编辑" ondblclick = "show_edit_school_name('<%= apply.id %>');" id="apply_title_<%= apply.id %>"><%= school_name.name %></span>
-                <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位名称" id="school_name_edit_<%=apply.id%>" onblur="edit_school_name('<%= edit_apply_name_school_path(apply.id)%>','<%= apply.id %>');"><%= school_name %></textarea>
+                <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位名称" id="school_name_edit_<%=apply.id%>" onblur="edit_school_name('<%= edit_apply_name_school_path(apply.id)%>','<%= apply.id %>');"></textarea>
             <% end %>
           </td>
           <td class="center">
@@ -73,7 +73,7 @@
             <span ondblclick = "show_edit_school_province('<%= apply.id %>');" id="apply_province_<%= apply.id %>">
             <%= (apply.province.nil? ? "" : apply.province) + (apply.city.nil? ? "" : apply.city)  %>
             </span>
-            <select onchange="showcity(this.value, document.getElementById('schoolCity_<%=apply.id%>'));edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="province" id="school_province_edit_<%=apply.id%>" class="fl" style="width:50px; height:18px; display: none">
+            <select onchange="showcity(this.value, document.getElementById('schoolCity_<%=apply.id%>'));edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="province" id="school_province_edit_<%=apply.id%>" class="fl" style="width:55px; height:18px; display: none">
               <option value="北京">北京</option>
               <option value="上海">上海</option>
               <option value="广东">广东</option>
@@ -110,7 +110,7 @@
               <option value="台湾">台湾</option>
               <option value="海外">海外</option>
             </select>
-            <select onchange="edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="city" id="schoolCity_<%=apply.id%>" class="fl ml5" style="width:50px; height:18px; display: none"></select>
+            <select onchange="edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="city" id="schoolCity_<%=apply.id%>" class="fl ml5" style="width:55px; height:18px; display: none"></select>
           </td>
           <td class="center">
             <span title="双击可编辑" ondblclick = "show_edit_school_address('<%= apply.id %>');" id="apply_address_<%= apply.id %>"><%= apply.address %></span>

app/views/applied_project/_applied_project_tip.js.erb

@@ -15,6 +15,8 @@
                 <p>请选择一个角色</p>
             <% elsif @flag == 4 %>
                 <p>您的申请已提交，请等待项目管理员审批</p>
+             <% elsif @flag == 5 %>
+                <p>您已经申请加入该项目了，请耐心等待</p>
             <% end %>
             </li>
             <li>

app/views/layouts/_show_messages_list.html.erb

@@ -88,6 +88,13 @@
       <% elsif ma.course_message_type == "Exercise" && ma.status == 3 %>
           <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了</a></li>
       <% end %>
+    <% elsif ma.class == AppliedMessage %>
+      <% if ma.applied_type == "AppliedProject" %>
+          <li><%=link_to "<span class='shadowbox_news_user'>#{applied_project_users(ma)}</span>".html_safe, user_path(applied_project_users(ma)), :target => '_blank' %>
+            <span><%= applied_project_tip_header(ma) %>以“<%= applied_project_message_type(ma.role) %>”身份加入<% project = Project.find(ma.project_id) %>
+                <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
+            </span>
+      <% end %>
     <% elsif ma.class == ForgeMessage %>
       <% if ma.forge_message_type == "AppliedProject" %>
           <li><a href="<%=settings_project_path(:id => ma.project, :tab => "members") %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 申请加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>申请加入项目：<%= ma.project.name%></a></li>

app/views/members/allow_to_join_project.js.erb

@@ -1,5 +1,5 @@
 <% if @flash_message %>
     alert("<%= @flash_message %>");
 <% else%>
-    $("#applied_project_<%= @applied_message.id %>").html('<%= render :partial => "users/user_message_applide_action", :locals =>{:ma => @applied_message} %>');
+    $("#applied_project_<%= @applied_message.id %>").html('<%= escape_javascript(render :partial => 'users/applied_project_content', :locals => {:ma => @applied_message}) %>');
 <% end%>

app/views/members/refused_allow_to_join_project.js.erb

@@ -1 +1 @@
-$("#applied_project_<%= @applied_message.id %>").html('<%= render :partial => "users/user_message_applide_action", :locals =>{:ma => @applied_message} %>');
+$("#applied_project_<%= @applied_message.id %>").html('<%= escape_javascript(render :partial => 'users/applied_project_content', :locals => {:ma => @applied_message}) %>');

app/views/users/_applied_project_content.html.erb

@@ -0,0 +1,15 @@
+<li class="homepageNewsPortrait fl">
+  <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(applied_project_users(ma)), :width => "30", :height => "30"), user_path(applied_project_users(ma)), :target => '_blank' %></a>
+</li>
+<li class="homepageNewsPubType fl">
+  <%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
+</li>
+<li class="homepageNewsContent fl" style="width:283px;"><a href="javascript:void(0);" class="newsGrey">
+  以“<%= applied_project_message_type(ma.role) %>”身份加入<% project = Project.find(ma.project_id) %>
+  <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
+</a>
+</li>
+<li class="fl" style="width:71px; height:49px;">
+  <span><%= render :partial => "users/user_message_applide_action", :locals =>{:ma => ma} %></span>
+</li>
+<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>

app/views/users/_user_message_applide_action.html.erb

@@ -1,3 +1,4 @@
+<% ma = ma.nil? ? @applied_message : ma %>
 <% if allow_to_show(ma) %>
     <%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id,  :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> |
     <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), :remote => true, :method => :get, :class => "link-blue" %>

app/views/users/_user_message_applied.html.erb

@@ -1,13 +1,13 @@
 <% if ma.class == AppliedMessage %>
     <!--申请加入项目-->
     <% if ma.applied_type == "ApplyAddSchools" %>
-        <% if ma.status == 1 || ma.status == 2 || ma.status == 3 || ma.status == 4 %>
+        <% if ma.status == 1 || ma.status == 2 || ma.status == 3 || ma.status == 0 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);">
               <% if ma.status == 1 || ma.status == 2 || ma.status == 3 %>
                 <%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %>
-              <% elsif ma.status == 4 %>
+              <% elsif ma.status == 0 %>
                 <%= link_to image_tag(url_to_avatar(ma.user), :width => "30", :height => "30"), user_path(ma.user), :target => '_blank' %>
               <% end %>
             </a>
@@ -24,7 +24,7 @@
                 <span class="newsBlue homepageNewsPublisher">系统提示</span>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的高校（单位）：</span>
                 <li class="homepageNewsContent fl">
-                  <a  class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="<%= ma.applied.name %>的申请，因名称不合法，系统已将其更改为“<%= ma.name %>”"><%= ma.applied.name %>的申请，因名称不合法，系统已将其更改为“<%= ma.name %>”</a>
+                  <a  class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="“<%= ma.applied.name %>”的申请，因名称不合法，系统已将其更改为“<%= ma.name %>”">“<%= ma.applied.name %>”的申请，因名称不合法，系统已将其更改为“<%= ma.name %>”</a>
                 </li>
                 <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
           <% elsif ma.status == 3 %>
@@ -34,7 +34,7 @@
                   <%= link_to "“"+ma.name+"”" + "的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料",  { :controller=> "my",:action => "account" }, :title => "“#{ma.name}”的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料", :target => '_blank'%>
                 </li>
                 <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-           <% elsif ma.status == 4 %>
+           <% elsif ma.status == 0 %>
                 <%=link_to User.where("id=?", ma.applied_user_id).first.show_name, user_path(ma.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"> 申请了单位：</span>
                 <li class="homepageNewsContent fl">
@@ -47,25 +47,8 @@
         </ul>
         <% end %>
     <% elsif ma && ma.applied_type == "AppliedProject" %>
-        <ul class="homepageNewsList fl">
+        <ul class="homepageNewsList fl" id="applied_project_<%= ma.id %>">
-          <li class="homepageNewsPortrait fl">
+          <%= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %>
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(applied_project_users(ma)), :width => "30", :height => "30"), user_path(applied_project_users(ma)), :target => '_blank' %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
-          </li>
-          <li class="homepageNewsContent fl" style="width:283px;"><a href="javascript:void(0);" class="newsGrey">
-            以“<%= applied_project_message_type(ma.role) %>”身份加入
-            <% project = Project.find(ma.project_id) %>
-            <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
-          </a>
-          </li>
-          <li class="fl" style="width:71px; height:49px;">
-            <span id="applied_project_<%= ma.id %>">
-                <%= render :partial => "users/user_message_applide_action", :locals =>{:ma => ma} %>
-            </span>
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
 <% end %>