summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/app/controllers/controller_extension/authentication.rb2
-rw-r--r--users/app/controllers/sessions_controller.rb4
-rw-r--r--users/app/controllers/users_controller.rb2
-rw-r--r--users/app/views/sessions/new.html.haml2
-rw-r--r--users/app/views/users/new.html.haml2
-rw-r--r--users/app/views/users/show.html.haml2
-rw-r--r--users/config/locales/en.yml2
-rw-r--r--users/config/routes.rb18
-rw-r--r--users/test/functional/sessions_controller_test.rb6
-rw-r--r--users/test/functional/users_controller_test.rb2
-rw-r--r--users/test/integration/browser/account_test.rb5
-rw-r--r--users/test/support/auth_test_helper.rb2
12 files changed, 27 insertions, 22 deletions
diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb
index dca3664..d831fbe 100644
--- a/users/app/controllers/controller_extension/authentication.rb
+++ b/users/app/controllers/controller_extension/authentication.rb
@@ -23,7 +23,7 @@ module ControllerExtension::Authentication
respond_to do |format|
format.html do
if logged_in?
- redirect_to root_url, :alert => t(:not_authorized)
+ redirect_to home_url, :alert => t(:not_authorized)
else
redirect_to login_url, :alert => t(:not_authorized_login)
end
diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb
index ca228c2..0195f30 100644
--- a/users/app/controllers/sessions_controller.rb
+++ b/users/app/controllers/sessions_controller.rb
@@ -1,7 +1,7 @@
class SessionsController < ApplicationController
def new
- redirect_to root_path if logged_in?
+ redirect_to home_url if logged_in?
@session = Session.new
if authentication_errors
@errors = authentication_errors
@@ -11,7 +11,7 @@ class SessionsController < ApplicationController
def destroy
logout
- redirect_to root_path
+ redirect_to home_url
end
#
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 0b32ec7..a874772 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -61,7 +61,7 @@ class UsersController < UsersBaseController
else
# let's remove the invalid session
logout
- redirect_to root_url
+ redirect_to home_url
end
end
diff --git a/users/app/views/sessions/new.html.haml b/users/app/views/sessions/new.html.haml
index 0939e00..771dc97 100644
--- a/users/app/views/sessions/new.html.haml
+++ b/users/app/views/sessions/new.html.haml
@@ -7,4 +7,4 @@
= f.input :password, :required => false, :input_html => { :id => :srp_password }
.form-actions
= f.button :submit, :value => t(:login), :class => 'btn-primary'
- = link_to t(:cancel), root_path, :class => 'btn'
+ = link_to t(:cancel), home_path, :class => 'btn'
diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml
index f8d14b5..aecf831 100644
--- a/users/app/views/users/new.html.haml
+++ b/users/app/views/users/new.html.haml
@@ -15,5 +15,5 @@
= f.input :password_confirmation, :required => false, :validate => true, :input_html => { :id => :srp_password_confirmation }
.form-actions
= f.button :submit, :value => t(:signup), :class => 'btn btn-primary'
- = link_to t(:cancel), root_url, :class => 'btn'
+ = link_to t(:cancel), home_path, :class => 'btn'
diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
index eace240..c587017 100644
--- a/users/app/views/users/show.html.haml
+++ b/users/app/views/users/show.html.haml
@@ -19,7 +19,7 @@
%li= icon('user') + link_to(t(:overview_account), edit_user_path(@user))
- # %li= icon('envelope') + link_to(t(:overview_email), {insert path for user identities, presuambly}
%li= icon('question-sign') + link_to(t(:overview_tickets), user_tickets_path(@user))
- %li= icon('shopping-cart') + link_to(t(:overview_billing), billing_top_link(@user)) if APP_CONFIG[:payment].present?
+ %li= icon('shopping-cart') + link_to(t(:overview_billing), billing_top_link(@user)) if APP_CONFIG[:billing]
.container-fluid
.row-fluid
= home_page_buttons(true) \ No newline at end of file
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 1b5dd5e..934fcee 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -46,7 +46,7 @@ en:
overview_intro: "From this user control panel, you can:"
overview_tickets: "Create and check support tickets."
overview_email: "Modify email settings."
- overview_account: "Change your password or delete your account."
+ overview_account: "Delete your account."
#
# rails
diff --git a/users/config/routes.rb b/users/config/routes.rb
index de2ff37..736b283 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -8,15 +8,17 @@ Rails.application.routes.draw do
resources :users, :only => [:create, :update, :destroy, :index]
end
- get "login" => "sessions#new", :as => "login"
- delete "logout" => "sessions#destroy", :as => "logout"
+ scope "(:locale)", :locale => MATCH_LOCALE do
+ get "login" => "sessions#new", :as => "login"
+ delete "logout" => "sessions#destroy", :as => "logout"
- get "signup" => "users#new", :as => "signup"
- resources :users, :except => [:create, :update] do
- # resource :email_settings, :only => [:edit, :update]
- # resources :email_aliases, :only => [:destroy], :id => /.*/
- post 'deactivate', on: :member
- post 'enable', on: :member
+ get "signup" => "users#new", :as => "signup"
+ resources :users, :except => [:create, :update] do
+ # resource :email_settings, :only => [:edit, :update]
+ # resources :email_aliases, :only => [:destroy], :id => /.*/
+ post 'deactivate', on: :member
+ post 'enable', on: :member
+ end
end
get "/.well-known/host-meta" => 'webfinger#host_meta'
diff --git a/users/test/functional/sessions_controller_test.rb b/users/test/functional/sessions_controller_test.rb
index 8b49005..fe7903f 100644
--- a/users/test/functional/sessions_controller_test.rb
+++ b/users/test/functional/sessions_controller_test.rb
@@ -17,11 +17,11 @@ class SessionsControllerTest < ActionController::TestCase
assert_template "sessions/new"
end
- test "redirect to root_url if logged in" do
+ test "redirect to home_url if logged in" do
login
get :new
assert_response :redirect
- assert_redirected_to root_url
+ assert_redirected_to home_url
end
test "renders json" do
@@ -53,7 +53,7 @@ class SessionsControllerTest < ActionController::TestCase
expect_logout
delete :destroy
assert_response :redirect
- assert_redirected_to root_url
+ assert_redirected_to home_url
end
end
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 9c5f8d9..002a011 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -103,7 +103,7 @@ class UsersControllerTest < ActionController::TestCase
delete :destroy, :id => @current_user.id
assert_response :redirect
- assert_redirected_to root_path
+ assert_redirected_to home_path
end
test "non-admin can't destroy user" do
diff --git a/users/test/integration/browser/account_test.rb b/users/test/integration/browser/account_test.rb
index 4cefe35..3785b72 100644
--- a/users/test/integration/browser/account_test.rb
+++ b/users/test/integration/browser/account_test.rb
@@ -14,7 +14,7 @@ class AccountTest < BrowserIntegrationTest
username, password = submit_signup
assert page.has_content?("Welcome #{username}")
click_on 'Logout'
- assert page.has_content?("Sign Up")
+ assert page.has_content?("Log In")
assert_equal '/', current_path
assert user = User.find_by_login(username)
user.account.destroy
@@ -25,6 +25,9 @@ class AccountTest < BrowserIntegrationTest
click_on 'Logout'
attempt_login(username, password)
assert page.has_content?("Welcome #{username}")
+ within('.sidenav li.active') do
+ assert page.has_content?("Overview")
+ end
User.find_by_login(username).account.destroy
end
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb
index 50e9453..57f9f9b 100644
--- a/users/test/support/auth_test_helper.rb
+++ b/users/test/support/auth_test_helper.rb
@@ -27,7 +27,7 @@ module AuthTestHelper
else
if logged_in
assert_equal({:alert => I18n.t(:not_authorized)}, flash.to_hash)
- assert_redirected_to root_url
+ assert_redirected_to home_url
else
assert_equal({:alert => I18n.t(:not_authorized_login)}, flash.to_hash)
assert_redirected_to login_url