caboose-cms 0.2.39 → 0.2.40

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmU4YTIzODdkMzQxNWI5Yjc1OGU0M2I2NGQ0ZjUyNTE5NDcyMGY5Nw==
+    MTJmM2MwY2E3YTMwNjM4YmEzZTAwMTg2OTEwZTVmODU2ZWRkMjFkMQ==
   data.tar.gz: !binary |-
-    YzJmZjdlODJkYjMyYWFkZjEzN2FiOTQ2Y2U0YjBkMmRjMGIzYzExZg==
+    YjY3OTY3MzY5MDY5MGRlNzVhOTJmZjAxNDFjY2VkMzljODU1MzY3MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODZjNjA2YTVlNWUwMTcyODJiMTUyMDUyYTA3MWM4ZTNiZTA5MTU1ZThjNDZi
-    ODkzZTg0YjY1YmU1NzEzNzIyNWIyYjE4YTJmZDdjZTFmN2I0ZmU5ZDc5MDIx
-    NzA2ZTk2NWZhNzQzOGQzYmFhMWZmOWFiYWFiZGYxMDJjYThhODc=
+    ODkxNDMyNGQwOTBhMzBjYjVlNGY0ODVhMmVmNGU2MDFjNTA0MWY2YjU4NDk5
+    MmRiZjM5Njk0MzUzYzM4MTI5MmRhYTRmODI5Zjg3Y2ZmMmYxZTI1ZTA1N2Fl
+    MWRmODk0MDc1YTEwNDJkZDY0OWEyNDYyMDA1MTIxODU4NWNlNTU=
   data.tar.gz: !binary |-
-    MTE0NmE3Yzc4MWZiYzU5ZmU1N2JlYjhkZDQ1NGNkZDI4NzE0NzdhZTYxN2Y1
-    OGYzZGFhNDY1NDAyZjkxMGE4MzY3N2FhMTMzYzVhYzRiNDQ5ZTM4OTA2ODVh
-    MTY2Nzk1NTA5YWE3YjRkMjY0ZDBkNDQyYjVlZTU3ODY2NGQyNmI=
+    Yzg1ZDM4YjI0YzAzYmFhZmRlM2VhODVlNzQ1YzU1ZjRiZWIzYjMwN2QyOWZm
+    MDljZGEwMjhjMDU1NzFkMjczMzY4ZjcyMGUyOWMwZDU5M2YwOWVjYjUzZDU2
+    MjhiZTJiMjViZDg0MjY1ZjYxOTQxZWIzN2RiNGEyYzhiZTAzYTQ=

data/app/controllers/caboose/register_controller.rb

@@ -5,6 +5,7 @@ module Caboose
     # GET /register
     def index
       @return_url = params[:return_url].nil? ? "/" : params[:return_url];
+      @modal = params[:modal].nil? ? false : params[:modal]
       redirect_to @return_url if logged_in?
     end
     

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

@@ -31,7 +31,7 @@ function register()
 		  if (resp.error)
 		    modal.autosize("<p class='note error'>" + resp.error + "</p>");
 			else if (resp.redirect != false)
-			  window.location = resp.redirect;
+			  <%= @modal ? "" : "parent." %>window.location = resp.redirect;			  
 			else
 			  parent.location.reload(true);
 		},

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.39'
+  VERSION = '0.2.40'
 end

metadata

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