carnival 0.0.33 → 0.0.34

data/app/controllers/carnival/base_admin_controller.rb

@@ -116,5 +116,16 @@ module Carnival
       namespace = arr[0] if arr.size > 1
       namespace
     end
+
+    def after_sign_in_path_for(user)
+      session[:admin_user_id] = user.id
+      raise
+      admin_root_path
+    end
+
+    def after_sign_out_path_for(user)
+      session[:admin_user_id] = nil
+      root_path
+    end
   end
 end

data/app/presenters/carnival/base_admin_presenter.rb

@@ -212,7 +212,9 @@ module Carnival
           related_class = model_class.reflect_on_association(field).klass.name.pluralize.underscore
         end
         if model_class.reflect_on_association(field).macro == :belongs_to
-          params = {:controller => related_class, :action => :show, :id => record.send(model_class.reflect_on_association(field).foreign_key)}
+          id = -1
+          id = record.send(model_class.reflect_on_association(field).foreign_key) if record.send(model_class.reflect_on_association(field).foreign_key).present?
+          params = {:controller => related_class, :action => :show, :id => id}
         else
           params = {:controller => related_class, :action => :index, :advanced_search => make_relation_advanced_query_url_options(field, record)}
         end

data/lib/carnival/version.rb

@@ -1,3 +1,3 @@
 module Carnival
-  VERSION = "0.0.33"
+  VERSION = "0.0.34"
 end

data/test/dummy/log/development.log

@@ -23831,3 +23831,37 @@ Started GET "/assets/carnival/sprites.png" for 10.0.2.2 at 2014-04-02 18:17:29 +
 
 
 Started GET "/assets/carnival/voltar.png" for 10.0.2.2 at 2014-04-02 18:17:29 +0000
+
+
+Started GET "/admin/trip_classifiers" for 10.0.2.2 at 2014-04-02 19:17:16 +0000
+
+ActionController::RoutingError (No route matches [GET] "/admin/trip_classifiers"):
+  actionpack (4.0.4) lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call'
+  actionpack (4.0.4) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
+  railties (4.0.4) lib/rails/rack/logger.rb:38:in `call_app'
+  railties (4.0.4) lib/rails/rack/logger.rb:20:in `block in call'
+  activesupport (4.0.4) lib/active_support/tagged_logging.rb:68:in `block in tagged'
+  activesupport (4.0.4) lib/active_support/tagged_logging.rb:26:in `tagged'
+  activesupport (4.0.4) lib/active_support/tagged_logging.rb:68:in `tagged'
+  railties (4.0.4) lib/rails/rack/logger.rb:20:in `call'
+  actionpack (4.0.4) lib/action_dispatch/middleware/request_id.rb:21:in `call'
+  rack (1.5.2) lib/rack/methodoverride.rb:21:in `call'
+  rack (1.5.2) lib/rack/runtime.rb:17:in `call'
+  activesupport (4.0.4) lib/active_support/cache/strategy/local_cache.rb:83:in `call'
+  rack (1.5.2) lib/rack/lock.rb:17:in `call'
+  actionpack (4.0.4) lib/action_dispatch/middleware/static.rb:64:in `call'
+  rack (1.5.2) lib/rack/sendfile.rb:112:in `call'
+  railties (4.0.4) lib/rails/engine.rb:511:in `call'
+  railties (4.0.4) lib/rails/application.rb:97:in `call'
+  rack (1.5.2) lib/rack/lock.rb:17:in `call'
+  rack (1.5.2) lib/rack/content_length.rb:14:in `call'
+  rack (1.5.2) lib/rack/handler/webrick.rb:60:in `service'
+  /home/vagrant/.rvm/rubies/ruby-1.9.3-p484/lib/ruby/1.9.1/webrick/httpserver.rb:138:in `service'
+  /home/vagrant/.rvm/rubies/ruby-1.9.3-p484/lib/ruby/1.9.1/webrick/httpserver.rb:94:in `run'
+  /home/vagrant/.rvm/rubies/ruby-1.9.3-p484/lib/ruby/1.9.1/webrick/server.rb:191:in `block in start_thread'
+
+
+  Rendered /home/vagrant/.rvm/gems/ruby-1.9.3-p484/gems/actionpack-4.0.4/lib/action_dispatch/middleware/templates/rescues/_trace.erb (1.5ms)
+  Rendered /home/vagrant/.rvm/gems/ruby-1.9.3-p484/gems/actionpack-4.0.4/lib/action_dispatch/middleware/templates/routes/_route.html.erb (8.6ms)
+  Rendered /home/vagrant/.rvm/gems/ruby-1.9.3-p484/gems/actionpack-4.0.4/lib/action_dispatch/middleware/templates/routes/_table.html.erb (2.2ms)
+  Rendered /home/vagrant/.rvm/gems/ruby-1.9.3-p484/gems/actionpack-4.0.4/lib/action_dispatch/middleware/templates/rescues/routing_error.erb within rescues/layout (68.4ms)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carnival
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -558,7 +558,6 @@ files:
 - test/dummy/tmp/cache/assets/development/sprockets/fd1e0a44b82fc47f26c7adec9d918911
 - test/dummy/tmp/cache/assets/development/sprockets/fe9a0ccc2a407c74780c85e66882e888
 - test/dummy/tmp/cache/assets/development/sprockets/ff3b0a569330823bd5599af14ee70cc8
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/notifications.yml
 - test/integration/navigation_test.rb
 - test/models/notification_test.rb
@@ -782,7 +781,6 @@ test_files:
 - test/dummy/tmp/cache/assets/development/sprockets/fd1e0a44b82fc47f26c7adec9d918911
 - test/dummy/tmp/cache/assets/development/sprockets/fe9a0ccc2a407c74780c85e66882e888
 - test/dummy/tmp/cache/assets/development/sprockets/ff3b0a569330823bd5599af14ee70cc8
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/notifications.yml
 - test/integration/navigation_test.rb
 - test/models/notification_test.rb

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-17319