caboose-cms 0.4.33 → 0.4.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MmJmNmZkYjJmYjI2YjU0MDEwOGYyNDVkNjA1ODU4MWZhZDJiYTJiYQ==
4
+ NzI0MzU1NTgyNDUwYWJmNDIwYzI4YWVjZTNmMTNlMmUwYjFiMmRkMQ==
5
5
  data.tar.gz: !binary |-
6
- NmYwMzM2YThmNDZlOGZlOTRiNzg1ZWFmM2JjMGFhMzc5MzQwMjJjYg==
6
+ M2Y1NzIwYWY5ZTJjMjc4YjM3MGM1ZmYxNDY3MDljNzA2N2RhNzNmYg==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- ZTA4MjBlMWVhZDVhMmE2M2M5Y2U5ZmFiZDYxYWJiZTdmMTc2OGM5ZDAwZWU0
10
- MzZmOTYxYmUwZmJkZmYwZGE3NTJiYjI4ODFmOGMyMGVhNWEzYmM1MDczMTU1
11
- ZTRiNWJkOTI1MTU4OTQyNmUyODY4YjQ5YzZhMzZkMmQyOWQ5NjU=
9
+ Njk4ZDkyZGY3NjJlZTQ0NzI4YjdkZDU0NmQ1YTYyODYyYTNmZTNhNjRjM2E2
10
+ YmNjYjMxNjAyMDIxY2E4YzU4MmVkMjBiOTRlMTAyODQ2ZjcxMzExN2ViOGE2
11
+ ZDJlMGNmODAzYjA5ZTA5ODVmNGRlNmY4ZmRjODFmNWJiMDNlNWE=
12
12
  data.tar.gz: !binary |-
13
- ZGNiZmYyNzEzNzBlNGExMjBlZjRiNGE1ZDQyY2YzZWQyOWU2MTlkYzYzMmVl
14
- MDg5NmVmZmRlZDA2MjJmMDJmNWY2MWY2MjBmMjgxMTJjMjk4YzFhMGNiZjU3
15
- ZmUyYzA1N2Q0NjMxMzk2Mzc4NTJjYWY2YWY1NWQzN2VmMWYzZjE=
13
+ MDA5MjgxOTJkMjlmY2ViYjc3MWVkZjVlZmZiMmQwODhkZDA1YjFlN2RmMDUz
14
+ MGYxYTE4NDM5NWMzYWViYzIyM2RkYWVmNTI2ZDdlNTk0M2JjZjM5MWY0NWEy
15
+ MjEzMTg4ODk2N2RhNTNmOTI1YWYzYWM1YTE5ZTVjMDhiZDU0MTU=
@@ -38,6 +38,7 @@ module Caboose
38
38
  remember = params[:remember] && (params[:remember] == 1 || params[:remember] == "1")
39
39
  login_user(login_resp.user, remember)
40
40
  resp.redirect = return_url
41
+ resp.modal = false
41
42
  Caboose.plugin_hook('login_success')
42
43
  end
43
44
  end
@@ -49,8 +49,14 @@ function login() {
49
49
  type: 'post',
50
50
  data: $('#login-form').serialize(),
51
51
  success: function(response) {
52
- if (response.error) modal.autosize("<p class='note error'>" + response.error + "</p>");
53
- else if (response.redirect != false) <%= @modal ? "" : "parent." %>window.location = response.redirect;
52
+ if (response.error) modal.autosize("<p class='note error'>" + response.error + "</p>");
53
+ else if (response.redirect != false)
54
+ {
55
+ if (response.modal)
56
+ window.location = response.redirect;
57
+ else
58
+ parent.window.location = response.redirect;
59
+ }
54
60
  else parent.location.reload(true);
55
61
  },
56
62
  error: function() {
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.4.33'
2
+ VERSION = '0.4.34'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.33
4
+ version: 0.4.34
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry