p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化用户申请加入项目界面刷新

This commit is contained in:
nwb 2014-05-21 19:30:49 +08:00
parent 104ee13ac7
commit 1d6816419d
5 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/applied_project_controller.rb
View File

@ -2,15 +2,28 @@ class AppliedProjectController < ApplicationController
#申请加入项目
def applied_join_project
@user_id = params[:user_id]
@project = Project.find(params[:project_id])
AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
redirect_to_referer_or {render :text => ( 'applied success.'), :layout => true}
#redirect_to project_path(params[:project_id])
#redirect_to_referer_or {render :text => ( 'applied success.'), :layout => true}
respond_to do |format|
format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
format.js { render :partial => 'set_applied'}
end
end
#取消申请
def unapplied_join_project
@project = Project.find(params[:project_id])
@applied = AppliedProject.find(params[:id])
@applied.destroy
redirect_to_referer_or {render :text => ( 'unsubscribe success.'), :layout => true}
#redirect_to project_path(params[:project_id])
#redirect_to_referer_or {render :text => ( 'unsubscribe success.'), :layout => true}
respond_to do |format|
format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
format.js { render :partial => 'set_applied' }
end
end
end

11
app/helpers/applied_project_helper.rb
View File

@ -1,14 +1,21 @@
module AppliedProjectHelper
def applied_css(project)
id = project.id
"#{project.class.to_s.underscore}-#{id}-applied"
end
def applied_link(project, user, options=[])
return '' unless user && user.logged?
applied = project.applied_projects.find_by_user_id(user.id)
text = applied ? l(:label_unapply_project) : l(:label_apply_project)
@applied_flag = project.instance_of?(Project)
css = @applied_flag ? ([applied_css(project), applied ? 'icon ' : 'icon '].join(' ') << options[0].to_s) :
([applied_css(project), applied ? 'icon icon-applied ' : 'icon icon-applied-off '].join(' ') << options[0].to_s)
if applied
appliedid = applied.id
end
url = appliedproject_path(
:id=>appliedid,
:user_id => user.id,
@ -16,6 +23,6 @@ module AppliedProjectHelper
)
method = applied ? 'delete' : 'post'
link_to text, url, :remote => true, :method => method
link_to text, url, :remote => true, :method => method ,:class=>css
end
end

14
app/helpers/watchers_helper.rb
View File

@ -188,15 +188,22 @@ module WatchersHelper
end.join.html_safe
end
def applied_css(project)
id = project.id
"#{project.class.to_s.underscore}-#{id}-applied"
end
def applied_link(project, user, options=[])
return '' unless user && user.logged?
applied = project.applied_projects.find_by_user_id(user.id)
text = applied ? l(:label_unapply_project) : l(:label_apply_project)
@applied_flag = project.instance_of?(Project)
css = @applied_flag ? ([applied_css(project), applied ? 'icon ' : 'icon '].join(' ') << options[0].to_s) :
([applied_css(project), applied ? 'icon icon-applied ' : 'icon icon-applied-off '].join(' ') << options[0].to_s)
if applied
appliedid = applied.id
end
url = appliedproject_path(
:id=>appliedid,
:user_id => user.id,
@ -204,6 +211,7 @@ module WatchersHelper
)
method = applied ? 'delete' : 'post'
link_to text, url, :remote => true, :method => method
link_to text, url, :remote => true, :method => method ,:class=>css
end
end
end

4
app/views/applied_project/_set_applied.js.erb Normal file
View File

@ -0,0 +1,4 @@
<% selector = ".#{applied_css(@project)}" %>
$("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript applied_link(@project, User.current) %>")});

6
app/views/layouts/base_projects.html.erb
View File

@ -105,9 +105,9 @@
</div>
<!--添加项目申请-->
<div style="margin-left: 20px;">
<% if ( !(User.current.member_of? @project) && User.current.login?) %> <!--added by linchun-->
<span class="icon-fav icon"></span><%= applied_link(@project, User.current) %>
<% if ( !(User.current.member_of? @project) && User.current.login?) %>
<span class="icon-fav icon"></span>
<%= applied_link(@project, User.current) %>
<% end %>
</div>