Merge branch 'ontoportal-lirmm-upstream'

ncbo · Nov 12, 2021 · 2ffd3c8 · 2ffd3c8
2 parents ad0e878 + 2de025e
commit 2ffd3c8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -103,7 +103,7 @@ def update
         render action: "edit"
       else
         flash[:notice] = 'Account was successfully updated'
-        #TODO test if not same users to update
+
         if session[:user].username == @user.username
           session[:user].update_from_params(user_params)
         end

diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
@@ -140,6 +140,6 @@
           = submit_tag "Update", :class=>"greenbtn btn btn-outline-secondary btn-sm "
           \&nbsp;&nbsp;&nbsp;&nbsp;
           - unless params[:password].eql?("true")
-            = link_to "Change Password", edit_user_path(CGI.escape(@user.username), password: true)
+            = link_to "Change Password", edit_user_path(@user.username, password: true)
             -# use @user.username unstead of sessions
     %br/
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
@@ -15,8 +15,8 @@
       %th Account Name:
       %td= @user.username
     %tr
-      %td{colspan: "2", style: "text-align: right;"}
-        %a{href: "/accounts/#{CGI.escape(@user.username)}/edit"} Edit Information
+      %td{:colspan => "2", :style => "text-align: right;"}
+        = link_to "Edit Information", "/accounts/#{CGI.escape(@user.username)}/edit"
   %br/
   %span{style: "font-size: large; font-weight: bold;"}
     API Key

diff --git a/config/routes.rb b/config/routes.rb
@@ -10,7 +10,7 @@
 
   resources :projects, constraints: { id: /[^\/]+/ }
 
-  resources :users, path: :accounts, requirements: { id: /.+/ }, constraints: { id: /[0-z\.\-\%]+/ }
+  resources :users, path: :accounts, constraints: { id: /[\d\w\.\-\%\+ ]+/ }
 
   resources :reviews
 
@@ -104,7 +104,7 @@
   get '/lost_pass' => 'login#lost_password'
   get '/reset_password' => 'login#reset_password'
   post '/accounts/:id/custom_ontologies' => 'users#custom_ontologies', :as => :custom_ontologies
-  get '/login_as/:login_as' => 'login#login_as' , constraints: { login_as: /[0-z\.]+/ }
+  get '/login_as/:login_as' => 'login#login_as' , constraints: { login_as:  /[\d\w\.\-\%\+ ]+/ }
   post '/login/send_pass', to: 'login#send_pass'
 
   # History