From 86e46cb954a49a50da79481031f396b1612a6813 Mon Sep 17 00:00:00 2001
From: Aaro Koivukangas <aaro.koivukangas@gmail.com>
Date: Mon, 14 Aug 2023 17:57:21 +0300
Subject: [PATCH] upto 3.16

---
 app/controllers/users_controller.rb |  6 +-----
 app/views/users/_form.html.erb      | 10 ++++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6f5de27..52ec3c4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -39,13 +39,9 @@ class UsersController < ApplicationController
 
   # PATCH/PUT /users/1 or /users/1.json
   def update
-    if not @user == current_user
-      redirect_to user_path(@user), notice: "User not authorized to edit this user"
-      return
-    end
 
     respond_to do |format|
-      if @user.update(user_params)
+      if user_params[:username].nil? && @user == current_user && @user.update(user_params)
         format.html { redirect_to user_url(@user), notice: "User was successfully updated." }
         format.json { render :show, status: :ok, location: @user }
       else
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 59f5f79..99c1958 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -13,10 +13,12 @@
     </div>
   <% end %>
 
-  <div>
-    <%= form.label :username, style: "display: block" %>
-    <%= form.text_field :username %>
-  </div>
+  <% if @user.new_record? %>
+    <div>
+      <%= form.label :username, style: "display: block" %>
+      <%= form.text_field :username %>
+    </div>
+  <% end %>
 
   <div>
     <%= form.label :password, style: "display: block" %>