diff --git a/app/assets/javascripts/supplier/app/models/list.js.coffee b/app/assets/javascripts/supplier/app/models/list.js.coffee index d02a846c..9db865c4 100644 --- a/app/assets/javascripts/supplier/app/models/list.js.coffee +++ b/app/assets/javascripts/supplier/app/models/list.js.coffee @@ -8,6 +8,7 @@ Qsupplier.App.List = DS.Model.extend price: attr 'number' table_number: attr 'number' table: DS.belongsTo('table', inverse: 'active_list') + #users: DS.hasMany('user', inverse: 'active_list') orders: DS.hasMany('order') section: DS.belongsTo('section') section_id: attr('string') diff --git a/app/assets/javascripts/supplier/app/models/user.js.coffee b/app/assets/javascripts/supplier/app/models/user.js.coffee new file mode 100644 index 00000000..c3c844b1 --- /dev/null +++ b/app/assets/javascripts/supplier/app/models/user.js.coffee @@ -0,0 +1,4 @@ +attr = DS.attr +Qsupplier.App.User= DS.Model.extend + uid: attr 'string' + #active_list: DS.belongsTo('list') diff --git a/app/assets/javascripts/supplier/app/templates/table.emblem b/app/assets/javascripts/supplier/app/templates/table.emblem index 76a18c91..8481143b 100644 --- a/app/assets/javascripts/supplier/app/templates/table.emblem +++ b/app/assets/javascripts/supplier/app/templates/table.emblem @@ -13,7 +13,9 @@ div class="table-actions table-actions-#{unbound table.id}" button{ action closeList table.active_list } class="btn btn-warning btn-small close-list" {{t 'list.close_list'}} /.table-action-row a href="suppliers_table_path(@table)" {{t 'section.tables_view.table_actions.got_to_table'}} -if editmode + each user in table.active_list.users + img src="http://graph.facebook.com/#{user.uid}/picture?type=square" +if editmode_beta .table-settings select option Round diff --git a/app/serializers/list_serializer.rb b/app/serializers/list_serializer.rb index 1b52f6a7..1645a2d0 100644 --- a/app/serializers/list_serializer.rb +++ b/app/serializers/list_serializer.rb @@ -1,6 +1,7 @@ class ListSerializer < Qwaiter::Serializer + # user ids for facebook pictures embed :ids - attributes :state, :needs_help, :needs_payment, :is_paid, :price, :table_id, :table_number, :section_id, :has_active_orders + attributes :state, :needs_help, :needs_payment, :is_paid, :price, :table_id, :table_number, :section_id, :has_active_orders, :user_ids def has_active_orders object.has_active_orders?