On Tue, Oct 27, 2009 at 4:27 PM, Naftoli Gugenheim <[email protected]>wrote:
>
> I won't be at a connection too soon. Could you paste the diff into the body
> of an email?
>
diff --git a/lift-base/lift-webkit/src/main/scala/net/liftweb/http/S.scala
b/lift-base/lift-webkit/src/main/scala/net/liftweb/http/S.scala
--- a/lift-base/lift-webkit/src/main/scala/net/liftweb/http/S.scala
+++ b/lift-base/lift-webkit/src/main/scala/net/liftweb/http/S.scala
@@ -716,6 +716,21 @@ object S extends HasParams {
*/
def uri: String = request.map(_.uri).openOr("/")
+/**
+* Returns the query string for the current request
+*/
+def queryString: Box[String] =
+for {
+ req <- request
+ queryString <- req.request.queryString
+} yield queryString
+
+
+def uriAndQueryString: Box[String] =
+for {
+ req <- this.request
+} yield req.uri + (queryString.map(s => "?"+s) openOr "")
+
/**
* Redirects the browser to a given URL. Note that the underlying
mechanism for redirects is to
* throw a ResponseShortcutException, so if you're doing the redirect
within a try/catch block,
diff --git
a/lift-persistence/lift-mapper/src/main/scala/net/liftweb/mapper/ProtoUser.scala
b/lift-persistence/lift-mapper/src/main/scala/net/liftweb/mapper/ProtoUser.scala
---
a/lift-persistence/lift-mapper/src/main/scala/net/liftweb/mapper/ProtoUser.scala
+++
b/lift-persistence/lift-mapper/src/main/scala/net/liftweb/mapper/ProtoUser.scala
@@ -156,10 +156,10 @@ trait MetaMegaProtoUser[ModelType <:
MegaProtoUser[ModelType]] extends KeyedMeta
loggedIn_? _,
() => {
import net.liftweb.http.{RedirectWithState, RedirectState}
- val uri = S.uri
+ val uri = S.uriAndQueryString
RedirectWithState(
loginPageURL,
- RedirectState( ()=>{loginRedirect.set(Full(uri))})
+ RedirectState( ()=>{loginRedirect.set(uri)})
)
}
)
> Thanks!
>
> -------------------------------------
> David Pollak<[email protected]> wrote:
>
> On Mon, Oct 26, 2009 at 7:59 PM, Naftoli Gugenheim <[email protected]
> >wrote:
>
> >
> > Could someone fix #121 (loginRedirect using S.uri; not getting part after
> > '?')
> >
>
> I've got a fix for this on review board. It'd be ideal if you could build
> dpp_issue_121 and insure that it does what you want.
>
>
> >
> > -------------------------------------
> > David Pollak<[email protected]> wrote:
> >
> > On Mon, Oct 26, 2009 at 4:24 PM, Viktor Klang <[email protected]
> > >wrote:
> >
> > > Folks,
> > >
> > > may I suggest cutting a Lift 1.1 Milestone 7 branch and deploy from
> that?
> > > (It'd eliminate the potential problems of synchronizing on a
> master/HEAD
> > > freeze)
> >
> >
> > And it makes it more complex to figure out what to merge off master,
> please
> > it means that testing against SNAPSHOT isn't testing against what will be
> > in
> > M7.
> >
> >
> > >
> > >
> > > On Tue, Oct 27, 2009 at 12:18 AM, David Pollak <
> > > [email protected]> wrote:
> > >
> > >> Folks,
> > >>
> > >> We are scheduled to release Lift 1.1 Milestone 7 on Wednesday November
> > >> 4th.
> > >>
> > >> We would like to release M7 against Scala 2.7.7 final if EPFL's
> schedule
> > >> can accommodate this.
> > >>
> > >> We are going into code-slush on Thursday October 29th (this means
> we're
> > >> not going to make material changes to the codebase unless it's to fix
> a
> > >> material bug).
> > >>
> > >> Please post any blocking defects to this list (with links to the
> > ticket).
> > >> We'll endeavor to close any of these defects this week.
> > >>
> > >> If you're a production site running against M6 and planning to upgrade
> > to
> > >> M7, please start testing as soon as possible so we can get fixes into
> M7
> > >> sooner rather than later.
> > >>
> > >> Thanks,
> > >>
> > >> David
> > >>
> > >>
> > >> --
> > >> Lift, the simply functional web framework http://liftweb.net
> > >> Beginning Scala http://www.apress.com/book/view/1430219890
> > >> Follow me: http://twitter.com/dpp
> > >> Surf the harmonics
> > >>
> > >>
> > >>
> > >
> > >
> > > --
> > > Viktor Klang
> > > | "A complex system that works is invariably
> > > | found to have evolved from a simple system
> > > | that worked." - John Gall
> > >
> > > Blog: klangism.blogspot.com
> > > Twttr: viktorklang
> > > Code: github.com/viktorklang
> > >
> > >
> > > >
> > >
> >
> >
> > --
> > Lift, the simply functional web framework http://liftweb.net
> > Beginning Scala http://www.apress.com/book/view/1430219890
> > Follow me: http://twitter.com/dpp
> > Surf the harmonics
> >
> >
> >
> > >
> >
>
>
> --
> Lift, the simply functional web framework http://liftweb.net
> Beginning Scala http://www.apress.com/book/view/1430219890
> Follow me: http://twitter.com/dpp
> Surf the harmonics
>
>
>
> >
>
--
Lift, the simply functional web framework http://liftweb.net
Beginning Scala http://www.apress.com/book/view/1430219890
Follow me: http://twitter.com/dpp
Surf the harmonics
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Lift" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/liftweb?hl=en
-~----------~----~----~----~------~----~------~--~---
