jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.组织页面中，退出后刷新组织页面； 

2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
This commit is contained in:
ouyangxuhua 2015-12-07 15:52:13 +08:00
parent 9f30c7a44e
commit 76db95aa03
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/organizations_controller.rb
View File

@ -239,6 +239,13 @@ class OrganizationsController < ApplicationController
end end
end end
def logout
logout_user
respond_to do |format|
format.html {redirect_to organization_path(params[:id])}
end
end
def search_projects def search_projects
@organization = Organization.find(params[:id]) @organization = Organization.find(params[:id])
condition = '%%' condition = '%%'

7
app/views/layouts/base_org.html.erb
View File

@ -46,12 +46,13 @@
<li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;"> <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
<span class="orgMenuArrow" id="orgArrow"> <span class="orgMenuArrow" id="orgArrow">
<ul class="org_login_list" style="display:none;"> <ul class="org_login_list" style="display:none;">
<li> <%= link_to "个人主页",user_path(User.current), :class => "linkGrey8" %></li> <li> <%= link_to "个人主页",user_path(User.current), :class => "linkGrey8", :target => "_blank" %></li>
<li><%= link_to "退出",signout_path, :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li> <li><%= link_to "退出",logout_organization_path(@organization), :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>
<!--<li><%#= link_to "退出",signout_path, :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>-->
</ul> </ul>
</span> </span>
</li> </li>
<li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><%=link_to User.current, user_path(User.current), :class => "linkGrey8 f14", :id => "orgUserName" %></li> <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="linkGrey8 f14" id="orgUserName"><%= User.current %></a></li>
<!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>--> <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
<% else %> <% else %>
<li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li> <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li>

1
config/routes.rb
View File

@ -46,6 +46,7 @@ RedmineApp::Application.routes.draw do
get 'search_projects' get 'search_projects'
post 'join_project_menu' post 'join_project_menu'
post 'join_projects' post 'join_projects'
post 'logout'
end end
collection do collection do
get 'check_uniq' get 'check_uniq'