carnival 0.0.33 → 0.0.34
Sign up to get free protection for your applications and to get access to all the features.
@@ -116,5 +116,16 @@ module Carnival
|
|
116
116
|
namespace = arr[0] if arr.size > 1
|
117
117
|
namespace
|
118
118
|
end
|
119
|
+
|
120
|
+
def after_sign_in_path_for(user)
|
121
|
+
session[:admin_user_id] = user.id
|
122
|
+
raise
|
123
|
+
admin_root_path
|
124
|
+
end
|
125
|
+
|
126
|
+
def after_sign_out_path_for(user)
|
127
|
+
session[:admin_user_id] = nil
|
128
|
+
root_path
|
129
|
+
end
|
119
130
|
end
|
120
131
|
end
|
@@ -212,7 +212,9 @@ module Carnival
|
|
212
212
|
related_class = model_class.reflect_on_association(field).klass.name.pluralize.underscore
|
213
213
|
end
|
214
214
|
if model_class.reflect_on_association(field).macro == :belongs_to
|
215
|
-
|
215
|
+
id = -1
|
216
|
+
id = record.send(model_class.reflect_on_association(field).foreign_key) if record.send(model_class.reflect_on_association(field).foreign_key).present?
|
217
|
+
params = {:controller => related_class, :action => :show, :id => id}
|
216
218
|
else
|
217
219
|
params = {:controller => related_class, :action => :index, :advanced_search => make_relation_advanced_query_url_options(field, record)}
|
218
220
|
end
|
data/lib/carnival/version.rb
CHANGED
@@ -23831,3 +23831,37 @@ Started GET "/assets/carnival/sprites.png" for 10.0.2.2 at 2014-04-02 18:17:29 +
|
|
23831
23831
|
|
23832
23832
|
|
23833
23833
|
Started GET "/assets/carnival/voltar.png" for 10.0.2.2 at 2014-04-02 18:17:29 +0000
|
23834
|
+
|
23835
|
+
|
23836
|
+
Started GET "/admin/trip_classifiers" for 10.0.2.2 at 2014-04-02 19:17:16 +0000
|
23837
|
+
|
23838
|
+
ActionController::RoutingError (No route matches [GET] "/admin/trip_classifiers"):
|
23839
|
+
actionpack (4.0.4) lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call'
|
23840
|
+
actionpack (4.0.4) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
|
23841
|
+
railties (4.0.4) lib/rails/rack/logger.rb:38:in `call_app'
|
23842
|
+
railties (4.0.4) lib/rails/rack/logger.rb:20:in `block in call'
|
23843
|
+
activesupport (4.0.4) lib/active_support/tagged_logging.rb:68:in `block in tagged'
|
23844
|
+
activesupport (4.0.4) lib/active_support/tagged_logging.rb:26:in `tagged'
|
23845
|
+
activesupport (4.0.4) lib/active_support/tagged_logging.rb:68:in `tagged'
|
23846
|
+
railties (4.0.4) lib/rails/rack/logger.rb:20:in `call'
|
23847
|
+
actionpack (4.0.4) lib/action_dispatch/middleware/request_id.rb:21:in `call'
|
23848
|
+
rack (1.5.2) lib/rack/methodoverride.rb:21:in `call'
|
23849
|
+
rack (1.5.2) lib/rack/runtime.rb:17:in `call'
|
23850
|
+
activesupport (4.0.4) lib/active_support/cache/strategy/local_cache.rb:83:in `call'
|
23851
|
+
rack (1.5.2) lib/rack/lock.rb:17:in `call'
|
23852
|
+
actionpack (4.0.4) lib/action_dispatch/middleware/static.rb:64:in `call'
|
23853
|
+
rack (1.5.2) lib/rack/sendfile.rb:112:in `call'
|
23854
|
+
railties (4.0.4) lib/rails/engine.rb:511:in `call'
|
23855
|
+
railties (4.0.4) lib/rails/application.rb:97:in `call'
|
23856
|
+
rack (1.5.2) lib/rack/lock.rb:17:in `call'
|
23857
|
+
rack (1.5.2) lib/rack/content_length.rb:14:in `call'
|
23858
|
+
rack (1.5.2) lib/rack/handler/webrick.rb:60:in `service'
|
23859
|
+
/home/vagrant/.rvm/rubies/ruby-1.9.3-p484/lib/ruby/1.9.1/webrick/httpserver.rb:138:in `service'
|
23860
|
+
/home/vagrant/.rvm/rubies/ruby-1.9.3-p484/lib/ruby/1.9.1/webrick/httpserver.rb:94:in `run'
|
23861
|
+
/home/vagrant/.rvm/rubies/ruby-1.9.3-p484/lib/ruby/1.9.1/webrick/server.rb:191:in `block in start_thread'
|
23862
|
+
|
23863
|
+
|
23864
|
+
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)
|
23865
|
+
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)
|
23866
|
+
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)
|
23867
|
+
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
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: carnival
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.34
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-04-
|
12
|
+
date: 2014-04-07 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
@@ -558,7 +558,6 @@ files:
|
|
558
558
|
- test/dummy/tmp/cache/assets/development/sprockets/fd1e0a44b82fc47f26c7adec9d918911
|
559
559
|
- test/dummy/tmp/cache/assets/development/sprockets/fe9a0ccc2a407c74780c85e66882e888
|
560
560
|
- test/dummy/tmp/cache/assets/development/sprockets/ff3b0a569330823bd5599af14ee70cc8
|
561
|
-
- test/dummy/tmp/pids/server.pid
|
562
561
|
- test/fixtures/notifications.yml
|
563
562
|
- test/integration/navigation_test.rb
|
564
563
|
- test/models/notification_test.rb
|
@@ -782,7 +781,6 @@ test_files:
|
|
782
781
|
- test/dummy/tmp/cache/assets/development/sprockets/fd1e0a44b82fc47f26c7adec9d918911
|
783
782
|
- test/dummy/tmp/cache/assets/development/sprockets/fe9a0ccc2a407c74780c85e66882e888
|
784
783
|
- test/dummy/tmp/cache/assets/development/sprockets/ff3b0a569330823bd5599af14ee70cc8
|
785
|
-
- test/dummy/tmp/pids/server.pid
|
786
784
|
- test/fixtures/notifications.yml
|
787
785
|
- test/integration/navigation_test.rb
|
788
786
|
- test/models/notification_test.rb
|
@@ -1 +0,0 @@
|
|
1
|
-
17319
|