many changes

2012-12-03 18:39:36 +01:00
parent e3dc6a7c68
commit 7d64ab2022
37 changed files with 540 additions and 101 deletions
@@ -19,7 +19,7 @@ class DashboardController < ApplicationController

  # Testing action
  def select_qrcode
-    @tables = Table.all.sample(2)
+    @tables = Table.all.sample(2) | List.active.map(&:table)
    render layout: 'phone'
  end