changing table user acceptance specs in the green

This commit is contained in:
2014-06-25 16:11:29 +02:00
parent 0e4993e8a6
commit 58f0937570
9 changed files with 89 additions and 45 deletions
@@ -1,7 +1,6 @@
App.SelectQrcodeController = Ember.Controller.extend
actions:
selectQr: (table)->
Qstorage.setItem 'table_id', table._id
@secured ->
$.getJSON($data_host + '/user/table_info.json?'+@authentication_string+'&table_id='+table._id).then (res)=>
if res.current_table_id
@@ -29,6 +28,8 @@ App.SelectQrcodeController = Ember.Controller.extend
if res2.occupied
@redirect_to 'user_root', message: 'move_table.cannot_move_to_occupied_tabe'
else
# Now we can move table
Qstorage.setItem 'table_id', table._id
@redirect_to 'table', table._id, message: 'move_table.moved_to_another_table'
cancel: =>
@redirect_to 'table', res.current_table_id
@@ -2,5 +2,5 @@ modal-dialog action="close"
h3.flush--top= title
p=body
hr
button{action "close"}= t 'confirm.cancel'
button.right{action 'confirm'}= t 'confirm.confirm'
button.confirm-cancel{action "close"}= t 'confirm.cancel'
button.confirm-ok.right{action 'confirm'}= t 'confirm.confirm'
@@ -1,2 +1,2 @@
each table in tables
img{action selectQr table} src="/table_qr_image.svg?table_id=#{unbound table._id}"
a{action selectQr table}: img src="/table_qr_image.svg?table_id=#{unbound table._id}"