mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-20 14:14:09 +01:00
fix #1167
This commit is contained in:
parent
b55725c9cd
commit
3c72148eb1
6 changed files with 14 additions and 3 deletions
|
|
@ -84,6 +84,12 @@ class LoginController < ApplicationController
|
|||
def expire_session
|
||||
# this is a hack to enable cucumber to expire a session by calling this
|
||||
# method. The method will be unavailable for production environment
|
||||
|
||||
@user.forget_me if logged_in?
|
||||
cookies.delete :auth_token
|
||||
session['user_id'] = nil
|
||||
reset_session
|
||||
|
||||
unless Rails.env.production?
|
||||
session['expiry_time'] = Time.now
|
||||
respond_to do |format|
|
||||
|
|
|
|||
|
|
@ -5,4 +5,5 @@
|
|||
-%>
|
||||
$('div#navcontainer').hide();
|
||||
$('div#content').html('<%=theHtml%>');
|
||||
refresh_page(); // refresh the page. if it fails, the message above remains
|
||||
<% end -%>
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
<% unless @due_tickles.empty? -%>
|
||||
TracksPages.page_notify('notice', "<%=t('todos.tickler_items_due', :count => @due_tickles.length)%>", 5);
|
||||
TracksPages.page_notify('notice', "<%=t('todos.tickler_items_due', :count => @due_tickles.length)%>", 8);
|
||||
<% end -%>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<% if @saved -%>
|
||||
remove_user_from_page();
|
||||
TracksPages.set_page_badge(<%= @total_users %>);
|
||||
TracksPages.page_notify('notice', '<%= t('users.destroy_successful', :login => @deleted_user.login) %>', 5);
|
||||
TracksPages.page_notify('notice', '<%= t('users.destroy_successful', :login => @deleted_user.login) %>', 8);
|
||||
<% else -%>
|
||||
TracksPages.page_notify('error', '<%= t('users.destroy_error', :login => @deleted_user.login) %>', 8);
|
||||
<% end -%>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue