From 7413298aad2a2218449addc9bc8af2d38b72acf3 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 28 Jul 2016 10:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=82=80=E8=AF=B7=E7=A0=81?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8F=8A=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/applied_project_controller.rb | 18 ++++++ app/helpers/watchers_helper.rb | 2 +- .../_applied_join_project.html.erb | 57 ++++++++++--------- .../applied_join_project.js.erb | 8 +-- .../applied_project_info.js.erb | 0 config/routes.rb | 1 + 6 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 app/views/applied_project/applied_project_info.js.erb diff --git a/app/controllers/applied_project_controller.rb b/app/controllers/applied_project_controller.rb index 39491c0e6..9ae3a5c4e 100644 --- a/app/controllers/applied_project_controller.rb +++ b/app/controllers/applied_project_controller.rb @@ -43,6 +43,24 @@ class AppliedProjectController < ApplicationController # end end + # @flage:提示语标志（1 邀请码错误；2 已经是项目成员； 3 角色没有选择; 4 申请成功） + # 申请成功则发送消息 + def applied_project_info + @project = Project.find(params[:project_id]) + if params[:invite_code].to_s != @project.invite_code + @flag = 1 + elsif User.current.member_of?(@project) + @flag = 2 + elsif params[:member_manager] != "on" || params[:member_developer] != "on" || params[:member_reporter] != "on" + @flag = 3 + else + @flag = 4 + end + if @flag == 4 + + end + end + #取消申请 def unapplied_join_project @project = Project.find(params[:project_id]) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 823fe534b..8c2db4005 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -364,7 +364,7 @@ module WatchersHelper :class => "pr_join_a" ,:id=>id end - #申请加入项目 + # 申请加入项目 def join_in_project_link(project, user, options=[]) applied = project.applied_projects.find_by_user_id(user.id) text = applied ? l(:label_unapply_project) : l(:label_apply_project) diff --git a/app/views/applied_project/_applied_join_project.html.erb b/app/views/applied_project/_applied_join_project.html.erb index baa49ef01..435be7f5e 100644 --- a/app/views/applied_project/_applied_join_project.html.erb +++ b/app/views/applied_project/_applied_join_project.html.erb @@ -1,28 +1,29 @@ - -
-

欢迎加入项目

- -
-
-
- -
+
+

欢迎加入项目

+ +
+
+
+ <%= form_tag( url_for(:controller => 'applied_project', :action => 'applied_project_info', :project_id => @project.id), :id => 'project_applied_form') do %> + + <% end %> +
diff --git a/app/views/applied_project/applied_join_project.js.erb b/app/views/applied_project/applied_join_project.js.erb index f79e9ac20..ed5dc51ac 100644 --- a/app/views/applied_project/applied_join_project.js.erb +++ b/app/views/applied_project/applied_join_project.js.erb @@ -1,7 +1,5 @@ -$('#ajax-modal').html('<%= escape_javascript(render :partial => 'applied_join_project', locals: { :course => @course}) %>'); +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'applied_join_project', locals: { }) %>'); showModal('ajax-modal', '500px'); - $('#ajax-modal').siblings().remove(); - -$('#ajax-modal').parent().css("top","").css("left",""); - +$('#ajax-modal').parent().css({"top":"40%","left":"50%","transform":"translate(-50%,-50%)","padding":"0","border":"none"}); +$('#ajax-modal').css({"padding":"0"}); diff --git a/app/views/applied_project/applied_project_info.js.erb b/app/views/applied_project/applied_project_info.js.erb new file mode 100644 index 000000000..e69de29bb diff --git a/config/routes.rb b/config/routes.rb index 4b9027335..7ef684491 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -722,6 +722,7 @@ RedmineApp::Application.routes.draw do delete 'issues/:object_id/watchers/:user_id' => 'watchers#destroy', :object_type => 'issue' post 'applied_project/applied_join', :to => 'applied_project#applied_join_project', :as => 'applied_join_project' + post 'applied_project/applied_project_info', :to => 'applied_project#applied_project_info', :as => 'applied_project_info' delete 'applied_project/applied', :to => 'applied_project#unapplied_join_project', :as => 'unapplied_join_project' resources :projects do