From 0bf9b5c6e6ce213cfb2a0049bff5aae11ff1173e Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 29 Jul 2016 20:31:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=BA=A2=E7=82=B9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=20=20=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/applied_project_controller.rb | 14 +++++++---- app/models/user.rb | 3 ++- .../_applied_join_project.html.erb | 2 +- .../applied_join_project.js.erb | 2 +- app/views/layouts/new_base_user.html.erb | 23 +++++++++++++++++-- 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/app/controllers/applied_project_controller.rb b/app/controllers/applied_project_controller.rb index 221adc7bc..d779c7759 100644 --- a/app/controllers/applied_project_controller.rb +++ b/app/controllers/applied_project_controller.rb @@ -2,7 +2,9 @@ class AppliedProjectController < ApplicationController helper :watchers #申请加入项目 def applied_join_project - @project = Project.find_by_id(params[:object_id]) + 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 - @project = Project.find(params[:project_id]) - if params[:invite_code].to_s != @project.invite_code + if params[:project_id].nil? + @project = Project.where(:invite_code => params[:invite_code]).first + else + @project = Project.find(params[:project_id]) + 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 diff --git a/app/models/user.rb b/app/models/user.rb index 996aa9be7..8de109169 100644 --- a/app/models/user.rb +++ b/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 # 查询指派给我的缺陷记录 diff --git a/app/views/applied_project/_applied_join_project.html.erb b/app/views/applied_project/_applied_join_project.html.erb index ad2d020c2..457cdf9cc 100644 --- a/app/views/applied_project/_applied_join_project.html.erb +++ b/app/views/applied_project/_applied_join_project.html.erb @@ -4,7 +4,7 @@
- <%= 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 %>
<%= 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 %> +
+
    +
  • +
      +
    • + <%= link_to "新建项目", new_project_path(:host=> Setting.host_name), :class => "menuGrey"%> +
      • +
    • + <%= link_to "加入项目", applied_join_project_path,:remote => true,:class => "menuGrey",:method => "post"%> +
      • +
    +
    • +
+
<% end%>
<%# 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");