End of day commit

This commit is contained in:
2015-08-10 19:39:06 +02:00
parent 3aef45a94e
commit e1b5ffcd06
30 changed files with 108 additions and 97 deletions
+9 -8
View File
@@ -58,15 +58,16 @@ private
I18n.locale = params[:locale].presence.try(:to_sym) || Rails.configuration.i18n.default_locale
end
def _render_with_renderer_json(resource, options)
serializer = build_json_serializer(resource, options)
#def _render_with_renderer_json(resource, options)
#serializer = build_json_serializer(resource, options)
if serializer
super(serializer, options)
else
super
end
end
#binding.pry
#if serializer
#super(serializer, options)
#else
#super
#end
#end
def layout_by_resource(*args)
#if devise_controller?
+1
View File
@@ -44,6 +44,7 @@ class UserController < Users::ApplicationController
res[:occupied] = @table.occupied?
res[:reserved] = @table.reserved?
res[:supplier_closed] = @table.supplier.closed?
res[:table] = @table.attributes
if list.present?
res[:other_supplier] = true if list.supplier_id != @table.supplier_id
res[:current_table_id] = list.table_id