before switch to ubuntu commit since apple has issues

This commit is contained in:
2015-08-13 12:54:02 +02:00
parent 6b764fcd39
commit 919474b54c
17 changed files with 81 additions and 41 deletions
+3 -3
View File
@@ -51,14 +51,14 @@ class Table
def occupied?
return @is_occupied if instance_variable_defined?(:'@is_occupied')
@is_occupied = !self.class.database.view(List.active_by_table_id_view(key: id, reduce: true)).zero?
@is_occupied = !self.class.database.view(List.active_view(key: [supplier_id, id], reduce: true)).zero?
end
alias occupied occupied?
def occupied=(val) end
def self.enrich_active_list_id(tables)
if tables.is_a?(Array)
lists = List.active_for_table(tables.map(&:id))
lists = List.active_for_table(tables)
for table in tables
if list = lists.find{|l| l.table_id == table.id}
table.active_list_id = list.id
@@ -79,7 +79,7 @@ class Table
def active_list
# nil memoizing
return @active_list if @active_list || @active_list_is_set
self.active_list = self.class.database.view(List.active_by_table_id_view(key: id, include_docs: true, reduce: false, limit: 1)).try(:first)
self.active_list = self.class.database.view(List.active_view(key: [supplier_id, id], include_docs: true, reduce: false, limit: 1)).try(:first)
end
def active_list=(val)