消息红点记录 个人主页添加加入项目入口

app/controllers/applied_project_controller.rb

@@ -2,7 +2,9 @@ class AppliedProjectController < ApplicationController
   helper :watchers
   #申请加入项目
   def applied_join_project
+    if params[:object_id]
       @project = Project.find_by_id(params[:object_id])
+    end
     # @user_id = params[:user_id]
     # if params[:project_join]
     #   if @project
@@ -46,8 +48,12 @@ class AppliedProjectController < ApplicationController
   # role:成员角色 => 0（4：管理人员；5：开发人员；6：报告人员）
   # 申请成功则发送消息
   def applied_project_info
+    if params[:project_id].nil?
+      @project = Project.where(:invite_code => params[:invite_code]).first
+    else
       @project = Project.find(params[:project_id])
-    if params[:invite_code].to_s != @project.invite_code
+    end
+    if !@project || params[:invite_code].to_s != @project.invite_code
       @flag = 1
     elsif User.current.member_of?(@project)
       @flag = 2
@@ -56,7 +62,7 @@ class AppliedProjectController < ApplicationController
     else
       @flag = 4
       role = params[:member] == "member_manager" ? 3 : (params[:member] = "member_developer" ? 4 :5)
-      applied_project = AppliedProject.create(:user_id => User.current.id, :project_id => params[:project_id], :role => role)
+      applied_project = AppliedProject.create(:user_id => User.current.id, :project_id => @project.id, :role => role)
       # 申请成功则给项目管理员发送邮件及发送消息
       Mailer.run.applied_project(applied_project)
     end

app/models/user.rb

@@ -369,7 +369,8 @@ class User < Principal
     system_messages_count = SystemMessage.where("created_at >?", onclick_time).count
     at_count = AtMessage.where("user_id =? and viewed =? and created_at >?", user.id, 0, onclick_time).count
     org_count = OrgMessage.where("user_id=? and viewed =? and created_at >?", user.id,0, onclick_time).count
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count + org_count
+    applied_count = AppliedMessage.where("user_id=? and viewed =? and created_at >?", user.id, 0, onclick_time).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count + org_count + applied_count
   end
 
   # 查询指派给我的缺陷记录

app/views/applied_project/_applied_join_project.html.erb

@@ -4,7 +4,7 @@
   <div class="cl"></div>
 </div>
 <div class="sy_popup_con" style="width:370px;">
-  <%= form_tag( url_for(:controller => 'applied_project', :action => 'applied_project_info', :project_id => @project.id), :remote => true, :id => 'project_applied_form') do %>
+  <%= form_tag( url_for(:controller => 'applied_project', :action => 'applied_project_info', :project_id => (@project.nil? ? nil : @project.id)), :remote => true, :id => 'project_applied_form') do %>
       <ul class="sy_popup_add ">
         <li>
           <label >项目邀请码：</label>

app/views/applied_project/applied_join_project.js.erb

@@ -1,3 +1,3 @@
-var htmlvalue = "<%= escape_javascript(render :partial => 'applied_join_project', locals: {:project_id => @project.id}) %>";
+var htmlvalue = "<%= escape_javascript(render :partial => 'applied_join_project', locals: {:project_id => (@project.nil? ? nil : @project.id)}) %>";
 pop_box_new(htmlvalue,460,40,50);
 

app/views/layouts/new_base_user.html.erb

@@ -245,8 +245,21 @@
         </div>
         <div class="homepageLeftMenuBlock">
           <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :class => "homepageMenuText" %>
-          <% if is_current_user%>
-              <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :style => "margin-right:10px;", :title => "新建项目"%>
+          <% if is_current_user %>
+              <div class="courseMenu" id="projectMenu">
+                <ul>
+                  <li class="courseMenuIcon fr" style="margin-right:10px;"  id="courseMenuIcon">
+                    <ul class="topnav_course_menu" id="topnav_project_menu">
+                      <li>
+                        <%= link_to "新建项目",  new_project_path(:host=> Setting.host_name), :class => "menuGrey"%>
+                      </li>
+                      <li>
+                        <%= link_to "加入项目", applied_join_project_path,:remote => true,:class => "menuGrey",:method => "post"%>
+                      </li>
+                    </ul>
+                  </li>
+                </ul>
+              </div>
           <% end%>
         </div>
         <%# if @user.projects.visible.count > 0
@@ -362,6 +375,12 @@
     $("#courseMenu").mouseleave(function(){
         $("#topnav_course_menu").hide();
     });
+    $("#projectMenu").mouseenter(function(){
+        $("#topnav_project_menu").show();
+    });
+    $("#projectMenu").mouseleave(function(){
+        $("#topnav_project_menu").hide();
+    });
     function leftCourseslistChange(){
         $('#homepageLeftMenuCourses').slideToggle();
         $('#hide_show_courseicon').toggleClass("homepageLeftMenuHideIcon");