caboose-cms 0.2.39 → 0.2.40

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.
Files changed (5) hide show
  1. checksums.yaml +8 -8
  2. data/app/controllers/caboose/register_controller.rb +1 -0
  3. data/app/views/caboose/register/index.html.erb +1 -1
  4. data/lib/caboose/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NmU4YTIzODdkMzQxNWI5Yjc1OGU0M2I2NGQ0ZjUyNTE5NDcyMGY5Nw==
4
+ MTJmM2MwY2E3YTMwNjM4YmEzZTAwMTg2OTEwZTVmODU2ZWRkMjFkMQ==
5
5
  data.tar.gz: !binary |-
6
- YzJmZjdlODJkYjMyYWFkZjEzN2FiOTQ2Y2U0YjBkMmRjMGIzYzExZg==
6
+ YjY3OTY3MzY5MDY5MGRlNzVhOTJmZjAxNDFjY2VkMzljODU1MzY3MA==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- ODZjNjA2YTVlNWUwMTcyODJiMTUyMDUyYTA3MWM4ZTNiZTA5MTU1ZThjNDZi
10
- ODkzZTg0YjY1YmU1NzEzNzIyNWIyYjE4YTJmZDdjZTFmN2I0ZmU5ZDc5MDIx
11
- NzA2ZTk2NWZhNzQzOGQzYmFhMWZmOWFiYWFiZGYxMDJjYThhODc=
9
+ ODkxNDMyNGQwOTBhMzBjYjVlNGY0ODVhMmVmNGU2MDFjNTA0MWY2YjU4NDk5
10
+ MmRiZjM5Njk0MzUzYzM4MTI5MmRhYTRmODI5Zjg3Y2ZmMmYxZTI1ZTA1N2Fl
11
+ MWRmODk0MDc1YTEwNDJkZDY0OWEyNDYyMDA1MTIxODU4NWNlNTU=
12
12
  data.tar.gz: !binary |-
13
- MTE0NmE3Yzc4MWZiYzU5ZmU1N2JlYjhkZDQ1NGNkZDI4NzE0NzdhZTYxN2Y1
14
- OGYzZGFhNDY1NDAyZjkxMGE4MzY3N2FhMTMzYzVhYzRiNDQ5ZTM4OTA2ODVh
15
- MTY2Nzk1NTA5YWE3YjRkMjY0ZDBkNDQyYjVlZTU3ODY2NGQyNmI=
13
+ Yzg1ZDM4YjI0YzAzYmFhZmRlM2VhODVlNzQ1YzU1ZjRiZWIzYjMwN2QyOWZm
14
+ MDljZGEwMjhjMDU1NzFkMjczMzY4ZjcyMGUyOWMwZDU5M2YwOWVjYjUzZDU2
15
+ MjhiZTJiMjViZDg0MjY1ZjYxOTQxZWIzN2RiNGEyYzhiZTAzYTQ=
data/app/controllers/caboose/register_controller.rb CHANGED
@@ -5,6 +5,7 @@ module Caboose
5
5
  # GET /register
6
6
  def index
7
7
  @return_url = params[:return_url].nil? ? "/" : params[:return_url];
8
+ @modal = params[:modal].nil? ? false : params[:modal]
8
9
  redirect_to @return_url if logged_in?
9
10
  end
10
11
 
data/app/views/caboose/register/index.html.erb CHANGED
@@ -31,7 +31,7 @@ function register()
31
31
  if (resp.error)
32
32
  modal.autosize("<p class='note error'>" + resp.error + "</p>");
33
33
  else if (resp.redirect != false)
34
- window.location = resp.redirect;
34
+ <%= @modal ? "" : "parent." %>window.location = resp.redirect;
35
35
  else
36
36
  parent.location.reload(true);
37
37
  },
data/lib/caboose/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.2.39'
2
+ VERSION = '0.2.40'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.39
4
+ version: 0.2.40
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-09-10 00:00:00.000000000 Z
11
+ date: 2013-09-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails