effective_regions 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1402399f8ff72dbb00f4f7a8f8f0f95f1570b297
-  data.tar.gz: 39358c292ded863b23e6bb76dd15aa505dce7c11
+  metadata.gz: 0c78dc9180e0b7a156b52b673f91fd017d04247f
+  data.tar.gz: a11f127759b7704cf71b358a558cafdaa66cb888
 SHA512:
-  metadata.gz: 99f3d78308d78d3e0408b576e45553d81f67fc06de00dc25e2fe7df9b75414bd0e31d31cd0d3b00b518535ebc3d0f3d38ff9c4131e7e4928baf3fd3d88849306
-  data.tar.gz: cb2d1b4a79be9bbd1e110be5595809ddea8e2e8428408a70888720a958619834d065a3235bc0cbc451237a8a4ae8a0632bfaeb79483adeb920654a0e3be97c4c
+  metadata.gz: 298e7224002ec5734308c98531fd58c51a3ce7cd5855226fb2f3aa63ca9e57c4f5f63aad66aa91eea0d6db25d9c979054e2c9c71b1ddbb45a527bdff5507d869
+  data.tar.gz: 79875c9df79a80b94ce30e0df31c19a15afc99c6d60d1b25d184d2b9651e6c1ca32ba5b53b84db49e72ffa02f188c3c554a1d4d8e0c1b6c04c2339d7365bb144

data/app/controllers/effective/regions_controller.rb

@@ -11,7 +11,7 @@ module Effective
     def edit
       EffectiveRegions.authorized?(self, :edit, Effective::Region.new())
 
-      cookies['effective_regions_editting'] = {:value => request.referrer, :path => '/'}
+      cookies['effective_regions_editting'] = {:value => params[:exit].presence || request.referrer, :path => '/'}
 
       # TODO: turn this into a cookie or something better.
       redirect_to request.url.gsub('/edit', '') + '?edit=true'

data/app/helpers/effective_regions_helper.rb

@@ -67,7 +67,7 @@ module EffectiveRegionsHelper
       end
     end
 
-    if effectively_editting? && can_edit # If we need the editable div
+    if effectively_editting? && (can_edit && options[:editable] != false) # If we need the editable div
       content_tag(editable_tag, opts) do
         region.try(:content).present? ? render_region(region, true) : ((capture(&block).strip.html_safe) if block_given?)
       end

data/lib/effective_regions/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRegions
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_regions
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails