seven_gallery 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f20922bff0ece3ee1228257a19fab8b826330cad
-  data.tar.gz: eeb4406914ee038c772bbad04d0de0cb60d8c55c
+  metadata.gz: f35a69f37fbc5f026b0c4aa4b5a104712a8a3b98
+  data.tar.gz: 7ea0ddd3fb2ad47b44d4db3ca736c7c8595c2575
 SHA512:
-  metadata.gz: 3337201d10824007e8a610292a1d61871a0fc70ddd06d5badb9c73495a7de003d302820ddbc73c7b4f845d86f13460af754c5c43a765383de1040447e4bd34b1
-  data.tar.gz: 02b48dc12f49ab5f99034ff31c1fa985e1cc70f31b35d8e8c1819c6bcccbfc0ea307f39f86ae3d07b75b371c167b2b9d028110880b019ae2668eff8a8c0cc788
+  metadata.gz: 54dd46052d8add9f7d37a6fbd8b4ff2147fb669abbe58c8b90082b0cb891df374ae06f502b637761624b09a308f76e4058e80be18779577d072769f7b9c3d33f
+  data.tar.gz: 29cf3790439bbae76740fdca66cc654e2adacf7c687955a360d105b15d08a6f030cc286210df1a264abf1c8e5507803dbd310799338c7b750fe1302dc1587a93

data/app/controllers/seven_gallery/concerns/photos_controller.rb

@@ -30,6 +30,7 @@ module SevenGallery::Concerns::PhotosController
 
   def update
     if @photo.update(photo_params)
+      session["end_url"] ||= request.referer
       redirect_to @gallery, notice: 'Photo was successfully updated.'
     else
       render :edit
@@ -46,7 +47,7 @@ module SevenGallery::Concerns::PhotosController
     @photos.reject! { |photo| photo.valid? }
     if @photos.empty?
       @valid_photos.map { |photo| photo.toggle!(:is_new) }
-      redirect_to @gallery
+      redirect_to session.delete(:end_url) || @gallery
     else
       render :photos_info
     end

data/app/models/seven_gallery/concerns/gallery.rb

@@ -3,6 +3,6 @@ module SevenGallery::Concerns::Gallery
 
 	included do
 		has_many :photos, class_name: "SevenGallery::Photo", foreign_key: "seven_gallery_gallery_id", dependent: :destroy
-    default_scope { order("created_at desc") }
+    	default_scope { order("created_at desc") }
 	end
 end

data/app/models/seven_gallery/concerns/photo.rb

@@ -2,7 +2,7 @@ module SevenGallery::Concerns::Photo
 	extend ActiveSupport::Concern
 
 	included do
-    belongs_to :gallery, class_name: "SevenGallery::Gallery"
+    belongs_to :gallery, class_name: "SevenGallery::Gallery", foreign_key: "seven_gallery_gallery_id"
     mount_uploader :image, SevenGallery::PhotoUploader
     attr_accessor :crop_x, :crop_y, :crop_h, :crop_w
     default_scope { order("position asc, created_at desc") }

data/lib/seven_gallery/version.rb

@@ -1,3 +1,3 @@
 module SevenGallery
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seven_gallery
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - rafael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails