caboose-cms 0.2.35 → 0.2.36

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjRmZjg0ZGRmMzllNThkNGM4NGMzZmRlMTAyZTg1YzgzMjM3NDUwMA==
+    MjIzNzNhMjIwOWE3NGE1Zjk1OWZiMDUwNGFhY2RiYzUyM2M2NTU5ZA==
   data.tar.gz: !binary |-
-    ZmU3ZWQxY2M4NzFiYzc0MTBiODgxZTliMWZlMWYzY2IwNmIxYzVhNw==
+    NDQ4M2FmMWE4ZmExMWZiYWQ2ZmU2ZGFjNjJmMzk3MDBkZTkxYmMxYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmNiMmQ0Zjk5MDQwYjE2NGY2MTJiMjFjYTNkNWQzYzIzZWIwYjZiMTQyYjM4
-    MzgyNTE4Y2IyZGZjNjA0MDIxYzg5YWM4N2UwZTY3ZmU4MTZlMTZkYjEyYjM5
-    ZGRkMTY2MjhlYmZjYTg5ODM0OGY0NmI1YTNkM2IzZGJiZDk2NGM=
+    N2QzYTAwNjQwZjhkOTE3NmZiMDk0ZTc0ODE4NzFlMDJmNDVlYjI0MjBlN2U0
+    ZTlmZmU1MDM5ZDcyMmJhNmUyYjU1MjcyMmY3ZDc0ZmZiMzBlYzAyOTE2NTg1
+    YmM1YTk4OTJjOWM4NjMzMDcxMmZiOGE3OTRlN2I1NmYzYWY4NGQ=
   data.tar.gz: !binary |-
-    YTRmZjgxNWFlYTMwNzUwZWFjNDJlMzAyMTEzZjlkMjIxNGI5YWYyMjA0MjY4
-    NTIyY2Q4NjlmN2MxYWFkNmFhYzg2MTMwYTA1NDcxN2NkNTNkZTMxY2JkNTMx
-    YWZlMzY1OWRmNjU1OGYyNDgwMjg2MTZiODlhNDAwODkxOTQ5NDk=
+    YTJiODYxMzU1YTQwMTM5YWNjZWUxMDhkZjY4ZTBhNjcyNGJmZTQ4MzhkMGRh
+    MGZkNjAxMzcyZmFhZTliNGYzMjdkYTJhMTNkZDVjMmI2YWJhZTA1ZjU1Mzky
+    YjM5OGIwYjY3OTc1NDEzYTliMDM1NjAxNTc0NDhiNjcxYzYxMzQ=

data/app/controllers/caboose/register_controller.rb

@@ -12,6 +12,7 @@ module Caboose
     def register
       
       resp = StdClass.new('error' => '', 'redirect' => '')
+      return_url = params[:return_url].nil? ? "/" : params[:return_url];
       
       if (logged_in?)
         resp.error = "Already logged in"
@@ -42,7 +43,7 @@ module Caboose
           u.password      = Digest::SHA1.hexdigest(Caboose::salt + pass1)
           u.creation_date = DateTime.now
           u.save                    
-          resp.redirect = "/login"
+          resp.redirect = "/login?return_url=#{return_url}"
 
         end
       end

data/app/views/caboose/login/index.html.erb

@@ -1,7 +1,7 @@
 
 <form action='/login' method='post' id='login_form'>
 <p class='other_options'>
-<a href='/register'>Need to register?</a>
+<a href='/register?return_url=<%= @return_url %>'>Need to register?</a>
 </p>
 <h1>Login</h1>
 <input type='hidden'    name='return_url' value='<%= @return_url %>' />

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.35'
+  VERSION = '0.2.36'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.35
+  version: 0.2.36
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails