bhf 0.6.28 → 0.6.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2abb9bd53865cc8d99809706049a86d9b29dbd97
-  data.tar.gz: 76d5a606c381d4a9cf8f2e81a31922e1c9dcfacf
+  metadata.gz: f2ccccdc0ae93b88b1c6a55269d0d31800f945b3
+  data.tar.gz: c3a2d36c7265e9d9b542b343c0971109fba40d2f
 SHA512:
-  metadata.gz: 7c8ba4ff2d93ca66ae2efe270ccd5c8a3e3f0c28a8167d283f0ef76d96d23e8d91e29aaba62cd6b767fc4521d686929c0837468b6b47a0b127a16a075e9091d2
-  data.tar.gz: 7ce4e66303a70fea248ce7eb72eb290a1402e2a0e7f7aba8883916e27cc9a0294e6dd5370a8177c89211b6ac984e39507bd1e5ad69110e4ac6a9a80d20f4eec4
+  metadata.gz: bd9016726c31d3ad4adbcaceed2c46e4a31e93177b308f6c30e4f94bb178e996c0d2a17c1472802c3202adc263f00b15b84c2a9ca808d02fcceaed3629b2ac36
+  data.tar.gz: 57e8ef3b89f26f52432ce5a6a9ab9eb6c0a52e077a11874cd2cdca58630b7f8237cd3c03ddeaf095dbb875ff3267a8890e52c7b0589aca34b6112911fba4d90f

data/app/controllers/bhf/application_controller.rb

@@ -103,8 +103,7 @@ class Bhf::ApplicationController < ActionController::Base
     end
 
     def redirect_back_or_default(default, msg)
-      redirect_to(session[:return_to] || default, flash: msg)
-      session[:return_to] = nil
+      redirect_to(params[:return_to] || default, flash: msg)
     end
 
 end

data/app/controllers/bhf/embed_entries_controller.rb

@@ -22,7 +22,7 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
       if @quick_edit
         render json: object_to_bhf_display_hash.merge(edit_path: edit_path), status: :ok
       else
-        redirect_back_or_default(edit_path, notice: set_message('create.success', @model))
+        redirect_to(edit_path, notice: set_message('create.success', @model))
       end
     else
       @form_url = entry_embed_index_path(@platform.name, @model.get_embedded_parent(params[:entry_id]))
@@ -42,7 +42,7 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
       if @quick_edit
         render json: object_to_bhf_display_hash, status: :ok
       else
-        redirect_back_or_default(edit_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object), notice: set_message('update.success', @model))
+        redirect_to(edit_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object), notice: set_message('update.success', @model))
       end
     else
       @form_url = entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)

data/app/views/bhf/entries/_form.haml

@@ -9,8 +9,13 @@
       = render partial: "bhf/entries/form/#{field.macro}/#{field.form_type}", locals: {f: f, field: field}
 
   - unless @quick_edit
+    - if @platform.return_to
+      - if (val = eval(@platform.return_to))
+        = hidden_field :return_to, :option, name: :return_to, value: val
+      -# TODO: remove eval
+      
     .node
       .label
       .input
         = f.submit f.object.new_record? ? new_t(@platform) : edit_t(@platform)
-        = link_to t('bhf.helpers.entry.cancel'), page_path(@platform.page_name), class: 'cancel'
+        = link_to t('bhf.helpers.entry.cancel'), page_path(@platform.page_name), class: 'cancel'

data/lib/bhf/i18n.rb

@@ -1,3 +1,4 @@
+# TODO: get rid of this
 module Bhf
   module I18nTranslationFallbackHelper
     def self.included(base) 

data/lib/bhf/platform.rb

@@ -176,6 +176,10 @@ module Bhf
       table_options 'partial'
     end
 
+    def return_to
+      form_options 'return_to'
+    end
+
     private
 
       def do_search(chain, search_params)

data/lib/rails/generators/bhf/templates/initializer.rb

@@ -2,8 +2,6 @@ module Bhf
   class Engine < Rails::Engine
 
     config.page_title = 'Bahnhof Admin'
-    # config.current_admin_account = :current_user
-    # config.session_auth_name = :admin
     # config.css = ['bhf_extend']
     # config.on_login_fail = :login_url
     # config.logout_path = :logout_path

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.6.28
+  version: 0.6.29
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.4
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 description: Gets you there on time
@@ -87,6 +87,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- README.md
 - app/assets/images/bhf/ajax_loader.gif
 - app/assets/images/bhf/bg.png
 - app/assets/images/bhf/mooeditable-toolbarbuttons-tango.png
@@ -212,7 +213,6 @@ files:
 - lib/bhf/platform.rb
 - lib/bhf/settings.rb
 - lib/rails/generators/bhf/templates/initializer.rb
-- README.md
 homepage: http://github.com/antpaw/bhf
 licenses:
 - MIT
@@ -223,17 +223,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Agnostic Rails backend