caboose-cms 0.4.33 → 0.4.34

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmJmNmZkYjJmYjI2YjU0MDEwOGYyNDVkNjA1ODU4MWZhZDJiYTJiYQ==
+    NzI0MzU1NTgyNDUwYWJmNDIwYzI4YWVjZTNmMTNlMmUwYjFiMmRkMQ==
   data.tar.gz: !binary |-
-    NmYwMzM2YThmNDZlOGZlOTRiNzg1ZWFmM2JjMGFhMzc5MzQwMjJjYg==
+    M2Y1NzIwYWY5ZTJjMjc4YjM3MGM1ZmYxNDY3MDljNzA2N2RhNzNmYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTA4MjBlMWVhZDVhMmE2M2M5Y2U5ZmFiZDYxYWJiZTdmMTc2OGM5ZDAwZWU0
-    MzZmOTYxYmUwZmJkZmYwZGE3NTJiYjI4ODFmOGMyMGVhNWEzYmM1MDczMTU1
-    ZTRiNWJkOTI1MTU4OTQyNmUyODY4YjQ5YzZhMzZkMmQyOWQ5NjU=
+    Njk4ZDkyZGY3NjJlZTQ0NzI4YjdkZDU0NmQ1YTYyODYyYTNmZTNhNjRjM2E2
+    YmNjYjMxNjAyMDIxY2E4YzU4MmVkMjBiOTRlMTAyODQ2ZjcxMzExN2ViOGE2
+    ZDJlMGNmODAzYjA5ZTA5ODVmNGRlNmY4ZmRjODFmNWJiMDNlNWE=
   data.tar.gz: !binary |-
-    ZGNiZmYyNzEzNzBlNGExMjBlZjRiNGE1ZDQyY2YzZWQyOWU2MTlkYzYzMmVl
-    MDg5NmVmZmRlZDA2MjJmMDJmNWY2MWY2MjBmMjgxMTJjMjk4YzFhMGNiZjU3
-    ZmUyYzA1N2Q0NjMxMzk2Mzc4NTJjYWY2YWY1NWQzN2VmMWYzZjE=
+    MDA5MjgxOTJkMjlmY2ViYjc3MWVkZjVlZmZiMmQwODhkZDA1YjFlN2RmMDUz
+    MGYxYTE4NDM5NWMzYWViYzIyM2RkYWVmNTI2ZDdlNTk0M2JjZjM5MWY0NWEy
+    MjEzMTg4ODk2N2RhNTNmOTI1YWYzYWM1YTE5ZTVjMDhiZDU0MTU=

data/app/controllers/caboose/login_controller.rb

@@ -38,6 +38,7 @@ module Caboose
             remember = params[:remember] && (params[:remember] == 1 || params[:remember] == "1")            
             login_user(login_resp.user, remember)            
             resp.redirect = return_url
+            resp.modal = false
             Caboose.plugin_hook('login_success')            
           end
         end

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

@@ -49,8 +49,14 @@ function login() {
 		type: 'post',
 		data: $('#login-form').serialize(),
 		success: function(response) {
-			if (response.error) modal.autosize("<p class='note error'>" + response.error + "</p>");
-			else if (response.redirect != false) <%= @modal ? "" : "parent." %>window.location = response.redirect;
+			if (response.error) modal.autosize("<p class='note error'>" + response.error + "</p>");			
+			else if (response.redirect != false)
+			{
+			  if (response.modal)
+			    window.location = response.redirect;
+			  else
+			    parent.window.location = response.redirect;
+			}
 			else parent.location.reload(true);
 		},
 		error: function() {	

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.33'
+  VERSION = '0.4.34'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.33
+  version: 0.4.34
 platform: ruby
 authors:
 - William Barry