Skip to content

Commit

Permalink
edit users digest rules Restream#16
Browse files Browse the repository at this point in the history
  • Loading branch information
phsin committed Nov 24, 2019
1 parent 5e1e0b1 commit 845728e
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 3 deletions.
6 changes: 3 additions & 3 deletions app/controllers/digest_rules_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ def create
end

def edit
@digest_rule = @user.digest_rules.find(params[:id])
@digest_rule = DigestRule.find(params[:id])
end

def update
@digest_rule = @user.digest_rules.find(params[:id])
@digest_rule = DigestRule.find(params[:id])
if @digest_rule.update_attributes(params[:digest_rule])
redirect_to controller: 'my', action: 'account'
else
Expand All @@ -31,7 +31,7 @@ def update
end

def destroy
digest_rule = @user.digest_rules.find(params[:id])
digest_rule = DigestRule.find(params[:id])
digest_rule.destroy
redirect_to controller: 'my', action: 'account'
end
Expand Down
73 changes: 73 additions & 0 deletions app/views/users/_form.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<%= error_messages_for 'user' %>

<div id="user_form">
<!--[form:user]-->
<div class="splitcontentleft">

<p><h1>TEST</h1></p>
<fieldset class="box tabular">
<legend><%=l(:label_information_plural)%></legend>
<p><%= f.text_field :login, :required => true, :size => 25 %></p>
<p><%= f.text_field :firstname, :required => true %></p>
<p><%= f.text_field :lastname, :required => true %></p>
<p><%= f.text_field :mail, :required => true %></p>
<% unless @user.force_default_language? %>
<p><%= f.select :language, lang_options_for_select %></p>
<% end %>
<% if Setting.openid? %>
<p><%= f.text_field :identity_url %></p>
<% end %>
<% @user.custom_field_values.each do |value| %>
<p><%= custom_field_tag_with_label :user, value %></p>
<% end %>

<p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
<%= call_hook(:view_users_form, :user => @user, :form => f) %>
</fieldset>

<fieldset class="box tabular">
<legend><%=l(:label_authentication)%></legend>
<% unless @auth_sources.empty? %>
<p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {$('#password_fields').show();} else {$('#password_fields').hide();}" %></p>
<% end %>
<div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
<p><%= f.password_field :password, :required => true, :size => 25 %>
<em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
<p><%= f.password_field :password_confirmation, :required => true, :size => 25 %></p>
<p><%= f.check_box :generate_password %></p>
<p><%= f.check_box :must_change_passwd %></p>
</div>
</fieldset>
</div>

<div class="splitcontentright">
<fieldset class="box">
<legend><%=l(:field_mail_notification)%></legend>
<%= render :partial => 'users/mail_notifications' %>
</fieldset>

<%= render "digest_rules/index" %>

<fieldset class="box tabular">
<legend><%=l(:label_preferences)%></legend>
<%= render :partial => 'users/preferences' %>
<%= call_hook(:view_users_form_preferences, :user => @user, :form => f) %>
</fieldset>
</div>
</div>
<div style="clear:left;"></div>
<!--[eoform:user]-->

<%= javascript_tag do %>
$(document).ready(function(){
$('#user_generate_password').change(function(){
var passwd = $('#user_password, #user_password_confirmation');
if ($(this).is(':checked')){
passwd.val('').attr('disabled', true);
}else{
passwd.removeAttr('disabled');
}
}).trigger('change');
});
<% end %>

0 comments on commit 845728e

Please sign in to comment.