[Logilogi-svn] SF.net SVN: logilogi:[1777] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1777] trunk
|
From: <wy...@us...> - 2010-09-23 18:12:43
|
Revision: 1777
http://logilogi.svn.sourceforge.net/logilogi/?rev=1777&view=rev
Author: wybow
Date: 2010-09-23 18:12:37 +0000 (Thu, 23 Sep 2010)
Log Message:
-----------
Increased range-lenghts, fixed loglog bug, improved redirects
Modified Paths:
--------------
trunk/app/controllers/application_controller.rb
trunk/app/controllers/invitations_controller.rb
trunk/app/controllers/password_resets_controller.rb
trunk/app/controllers/user_sessions_controller.rb
trunk/app/controllers/users_controller.rb
trunk/app/models/log_log_subscription.rb
Added Paths:
-----------
trunk/db/migrate/20100923165007_increase_ranges_string_size_again.rb
Modified: trunk/app/controllers/application_controller.rb
===================================================================
--- trunk/app/controllers/application_controller.rb 2010-09-13 21:11:01 UTC (rev 1776)
+++ trunk/app/controllers/application_controller.rb 2010-09-23 18:12:37 UTC (rev 1777)
@@ -63,9 +63,13 @@
#
def append_return_url
session[:return_urls] ||= []
- if params[:action] != "create" and params[:action] != "update" and
- params[:action] != "destroy"
+ if params[:action] == "create" or params[:action] == "update" or
+ params[:action] == "destroy" or
+ (params[:controller] == "user" and params[:action] == "new")
+ # do nothing
+ else
if session[:return_urls].last == request.url
+ # Takes double out in redirect, single in back
session[:return_urls].pop
else
referrer = request.env["HTTP_REFERER"]
@@ -89,6 +93,16 @@
session[:return_url] = session[:return_urls].last
end
+ # Redirects to the last visited url
+ #
+ def redirect_to_return_url_or_default(default_url = nil)
+ url = return_url_or_default(default_url)
+ # Adds an extra copy of the last url which will be popped again
+ # in append_return_url
+ session[:return_urls].push(url)
+ redirect_to url
+ end
+
# Returns the last visited url
#
def return_url_or_default(default_url = nil)
@@ -727,7 +741,7 @@
def require_no_login
if !self.current_user.anonymous?
flash[:warning] = t 'c.application.must_not_be_logged_in'
- redirect_to return_url_or_default(user_url(current_user))
+ redirect_to_return_url_or_default(user_url(current_user))
return false
end
end
Modified: trunk/app/controllers/invitations_controller.rb
===================================================================
--- trunk/app/controllers/invitations_controller.rb 2010-09-13 21:11:01 UTC (rev 1776)
+++ trunk/app/controllers/invitations_controller.rb 2010-09-23 18:12:37 UTC (rev 1777)
@@ -41,7 +41,7 @@
flash[:notice] = t 'c.invitations.sent_to',
:user => @invitation.user.name
end
- redirect_to return_url_or_default # same form again for another invite
+ redirect_to_return_url_or_default # same form again for another invite
else
@invitation = Invitation.new
flash[:error] = t 'c.invitations.error_creating'
@@ -81,7 +81,7 @@
end
unless @invitation
flash[:notice] = t 'c.invitations.url_issues'
- redirect_to return_url_or_default
+ redirect_to_return_url_or_default
end
end
Modified: trunk/app/controllers/password_resets_controller.rb
===================================================================
--- trunk/app/controllers/password_resets_controller.rb 2010-09-13 21:11:01 UTC (rev 1776)
+++ trunk/app/controllers/password_resets_controller.rb 2010-09-23 18:12:37 UTC (rev 1777)
@@ -33,7 +33,7 @@
if @user
@user.deliver_password_reset_instructions!
flash[:notice] = t 'c.password_resets.instructions_emailed'
- redirect_to return_url_or_default
+ redirect_to_return_url_or_default
else
@user = User.new
flash[:error] = t 'c.password_resets.error_not_found'
@@ -63,7 +63,7 @@
@user = User.find_using_perishable_token(params[:id])
unless @user
flash[:notice] = t 'c.password_resets.url_issues'
- redirect_to return_url_or_default
+ redirect_to_return_url_or_default
end
end
end
Modified: trunk/app/controllers/user_sessions_controller.rb
===================================================================
--- trunk/app/controllers/user_sessions_controller.rb 2010-09-13 21:11:01 UTC (rev 1776)
+++ trunk/app/controllers/user_sessions_controller.rb 2010-09-23 18:12:37 UTC (rev 1777)
@@ -45,7 +45,7 @@
if session[:invitation].nil?
flash.now[:notice] = t 'c.user_sessions.logged_in'
shift_return_url
- redirect_to return_url_or_default(user_url(@user_session.user))
+ redirect_to_return_url_or_default(user_url(@user_session.user))
else
flash.now[:notice] = t 'c.user_sessions.logged_in_accept_invitation'
redirect_to edit_invitation_url(session[:invitation])
@@ -63,7 +63,7 @@
def destroy
self.current_user_session.destroy
flash[:notice] = t 'c.user_sessions.logged_out'
- redirect_to root_url
+ redirect_to_return_url_or_default
end
### Tabbed methods
Modified: trunk/app/controllers/users_controller.rb
===================================================================
--- trunk/app/controllers/users_controller.rb 2010-09-13 21:11:01 UTC (rev 1776)
+++ trunk/app/controllers/users_controller.rb 2010-09-23 18:12:37 UTC (rev 1777)
@@ -70,15 +70,13 @@
@user.deliver_welcome!
if session[:invitation].nil?
flash[:notice] = t 'c.users.created'
- shift_return_url
- redirect_to return_url_or_default
+ redirect_to_return_url_or_default
else
flash[:notice] = t 'c.users.created_accept_invitation'
redirect_to edit_invitation_url(session[:invitation])
end
else
flash.now[:error] = t 'c.users.error_creating'
- shift_return_url
if !@user.openid_identifier.nil?
@selected = "openid"
end
@@ -105,7 +103,7 @@
@user.save do |result|
if result
flash[:notice] = t 'c.users.updated'
- redirect_to return_url_or_default(user_url(@user))
+ redirect_to_return_url_or_default(user_url(@user))
else
flash[:error] = t 'c.users.error_updating'
render :action => :edit
@@ -117,7 +115,7 @@
params[:prefs_profile][:default_peer_group_id])
if @prefs_profile.save
flash[:notice] = t 'c.users.settings_updated'
- redirect_to return_url_or_default(user_url(@user))
+ redirect_to_return_url_or_default(user_url(@user))
else
flash[:error] = t 'c.users.error_updating_settings'
render :action => 'edit'
@@ -138,7 +136,7 @@
end
end
flash[:notice] = t 'c.users.settings_updated'
- redirect_to return_url_or_default(user_url(@user))
+ redirect_to_return_url_or_default(user_url(@user))
end
end
Modified: trunk/app/models/log_log_subscription.rb
===================================================================
--- trunk/app/models/log_log_subscription.rb 2010-09-13 21:11:01 UTC (rev 1776)
+++ trunk/app/models/log_log_subscription.rb 2010-09-23 18:12:37 UTC (rev 1777)
@@ -28,11 +28,11 @@
periodical = page.body
if periodical =~ /[^\s]/
if lls.channel == "logis"
- Notifier.deliver_logis_log(user, period, periodical)
+ Notifier.deliver_logis_log(lls.user, period, periodical)
else
- Notifier.deliver_personalized_log(user, period, periodical)
+ Notifier.deliver_personalized_log(lls.user, period, periodical)
end
- sent_to << user.name
+ sent_to << lls.user.name
end
rescue
end
Added: trunk/db/migrate/20100923165007_increase_ranges_string_size_again.rb
===================================================================
--- trunk/db/migrate/20100923165007_increase_ranges_string_size_again.rb (rev 0)
+++ trunk/db/migrate/20100923165007_increase_ranges_string_size_again.rb 2010-09-23 18:12:37 UTC (rev 1777)
@@ -0,0 +1,11 @@
+class IncreaseRangesStringSizeAgain < ActiveRecord::Migration
+ def self.up
+ change_column :logi_versions, :position_ranges_string, :string, :limit => 16384
+ change_column :annotations, :position_ranges_string, :string, :limit => 2048
+ change_column :external_links, :position_ranges_string, :string, :limit => 2048
+ change_column :links, :position_ranges_string, :string, :limit => 2048
+ end
+
+ def self.down
+ end
+end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|