Skip to content

Commit

Permalink
[webui] Fix change_passwd setting and enable it by default
Browse files Browse the repository at this point in the history
  • Loading branch information
hennevogel authored and adrianschroeter committed May 14, 2013
1 parent ce0a068 commit 7a7351e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
13 changes: 8 additions & 5 deletions src/webui/app/views/home/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,20 @@
</p>
<% if not @displayed_user.groups.empty? %>
<h6>Member of</h6>
<p>
<ul>
<% @displayed_user.groups.each do |group| %>
<%= link_to(group, :controller => 'group', :action => 'show', :group => group) %>
<li><%= link_to(group, :controller => 'group', :action => 'show', :group => group) %></li>
<% end %>
</p>
<% end %>
<% if @displayed_user.globalrole && !@displayed_user.globalrole.to_s.empty? %>
<% if @displayed_user.groups.empty? %>
<h6>Member of</h6>
<ul>
<% end %>
<p><%= @displayed_user.globalrole %></p>
<% @displayed_user.globalrole.each do |role| %>
<li><%= role %></li>
<% end %>
</ul>
<% end %>
<!-- roles -->
<% if @user and @displayed_user.to_s == @user.login %>
Expand All @@ -44,7 +47,7 @@
<% else %>
<%= link_to(sprite_tag('user_edit') + " Edit your account", { :controller => "user", :action => "save_dialog", :user => @user }, {:id => 'save_dialog', :remote => true}) %><br />
<% end %>
<% if CONFIG['change_passwd'].to_s == 'on' %>
<% if CONFIG['change_passwd'] == :on and CONFIG['proxy_auth_mode'] != :on %>
<%= link_to(sprite_tag('key') + " Change your password", { :controller => "user", :action => "password_dialog", :user => @user }, {:id => 'password_dialog', :remote => true}) %><br />
<% end %>
</p>
Expand Down
2 changes: 1 addition & 1 deletion src/webui/config/options.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ theme: neutral
#use_lighttpd_x_rewrite: true

# Show option to change password (not possible if passwords are controlled by proxy)
#change_passwd: on
change_passwd: :on

# if your users access the hosts through a proxy (or just a different name, use this to
# overwrite the settings for users)
Expand Down

0 comments on commit 7a7351e

Please sign in to comment.