From 845728e69ed8050cb11d4a4cb6479b3e676e0f3d Mon Sep 17 00:00:00 2001
From: phsin <phsin@kb99.pro>
Date: Sun, 24 Nov 2019 15:59:00 +0400
Subject: [PATCH] edit users digest rules #16

---
 app/controllers/digest_rules_controller.rb |  6 +-
 app/views/users/_form.html.erb             | 73 ++++++++++++++++++++++
 2 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 app/views/users/_form.html.erb

diff --git a/app/controllers/digest_rules_controller.rb b/app/controllers/digest_rules_controller.rb
index 006157e..86c41f6 100644
--- a/app/controllers/digest_rules_controller.rb
+++ b/app/controllers/digest_rules_controller.rb
@@ -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
@@ -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
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
new file mode 100644
index 0000000..80d2a2c
--- /dev/null
+++ b/app/views/users/_form.html.erb
@@ -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 %>