Merge pull request #360 from ncbo/bugfix/account-settings-access/346

Restore access to account settings page for usernames with @ symbols

app/controllers/users_controller.rb

@@ -141,19 +141,10 @@ def unescape_id
   def verify_owner
     return if current_user_admin?
 
-    if session[:user].nil? || (!session[:user].id.eql?(params[:id]) && !session[:user].username.eql?(params[:id]))
-      redirect_to controller: 'login', action: 'index', redirect: "/accounts/#{params[:id]}"
-    end
-  end
+    user = session[:user]
+    return if user&.id == params[:id] || user&.username == params[:id]
 
-  def get_ontology_list(ont_hash)
-    return '' if ont_hash.nil?
-
-    ontologies = []
-    ont_hash.each do |ont, checked|
-      ontologies << ont if checked.to_i == 1
-    end
-    ontologies.join(';')
+    redirect_to login_index_path(redirect: "/accounts/#{params[:id]}")
   end
 
   def validate(params)

config/routes.rb

@@ -11,7 +11,7 @@
 
   resources :projects, constraints: { id: /[^\/]+/ }
 
-  resources :users, path: :accounts, constraints: { id: /[\d\w\.\-\%\+ ]+/ }
+  resources :users, path: :accounts, constraints: { id: /[\d\w\.\-\%\+\@ ]+/ }
 
   resources :mappings do
     member do