fixed registration issues

This commit is contained in:
Connor Turland 2014-03-03 10:28:16 -08:00
parent 1c5a57d67c
commit 8c1c4e3202
4 changed files with 15 additions and 11 deletions

View file

@ -8321,7 +8321,7 @@ Layouts.ForceDirected = new Class({
if(incremental) { if(incremental) {
(function iter() { (function iter() {
for(var total=incremental.iter, j=0; j<total; j++) { for(var total=incremental.iter, j=0; j<total; j++) {
opt.t = opt.tstart * (1 - i++/(times -1)); opt.t = opt.tstart * (1 - (i++)/(times -1));
that.computePositionStep(property, opt); that.computePositionStep(property, opt);
if(i >= times) { if(i >= times) {
incremental.onComplete(); incremental.onComplete();

View file

@ -16,14 +16,6 @@ class ApplicationController < ActionController::Base
end end
end end
def after_sign_in_path_for(resource)
session[:previous_url] || root_path
end
def after_sign_up_path_for(resource)
root_path
end
private private
def require_no_user def require_no_user

View file

@ -0,0 +1,12 @@
class RegistrationsController < Devise::RegistrationsController
protected
def after_sign_in_path_for(resource)
session[:previous_url] || root_path
end
def after_sign_up_path_for(resource)
root_path
end
end

View file

@ -33,12 +33,12 @@ ISSAD::Application.routes.draw do
match 'maps/:id/embed', to: 'maps#embed', via: :get, as: :embed match 'maps/:id/embed', to: 'maps#embed', via: :get, as: :embed
match 'maps/:id/:format', to: 'maps#json', via: :get, as: :json match 'maps/:id/:format', to: 'maps#json', via: :get, as: :json
devise_for :users, :path_names => { :sign_in => 'login', :sign_out => 'logout' } devise_for :users, :controllers => { :registrations => "registrations" }, :path_names => { :sign_in => 'login', :sign_out => 'logout' }
devise_scope :user do devise_scope :user do
get "sign_out", :to => "devise/sessions#destroy" get "sign_out", :to => "devise/sessions#destroy"
end end
resources :users, except: :show resources :users, except: [:show, :index]
resources :mappings resources :mappings