alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix orbit bar edit password and profile link

This commit is contained in:
manson 2014-07-21 11:46:26 +08:00
parent a6cc379e7a
commit 55bf9c4343
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/members_controller.rb
View File

@ -219,7 +219,7 @@ class Admin::MembersController < OrbitMemberController
def edit_passwd def edit_passwd
@user = @member.user @user = @member.user
if current_user.id == @user.id unless current_user.id == @user.id or current_user.is_admin?
redirect_to :action => :index redirect_to :action => :index
end end
end end

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

@ -35,11 +35,9 @@
<% end %> <% end %>
</a> </a>
<ul class="dropdown-menu" role="menu" aria-labelledby="orbit-user"> <ul class="dropdown-menu" role="menu" aria-labelledby="orbit-user">
<li><%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' + t("users.change_passwd"), tabindex: '-1' %></li> <li><%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' + t("users.change_passwd"),admin_member_edit_passwd_path(current_user.member_profile.to_param), tabindex: '-1' %></li>
<li><%= link_to content_tag(:i, nil, class: 'icons-vcard') + ' ' + t("users.user_basic_data"), tabindex: '-1' %></li> <li><%= link_to content_tag(:i, nil, class: 'icons-vcard') + ' ' + t("users.user_basic_data"),admin_member_path(current_user.member_profile.to_param), tabindex: '-1' %></li>
<li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' + t(:logout), logout_path, tabindex: '-1' %></li> <li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' + t(:logout), logout_path, tabindex: '-1' %></li>
<li class="divider"></li>
<li><a tabindex="-1" href="#"><i class="icons-lifebuoy"></i> <%= t(:help) %></a></li>
</ul> </ul>
</li> </li>
<% else %> <% else %>