logauth
/
SMMP
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/SATS/states' into dev

This commit is contained in:
xdrm-brackets 2017-02-23 17:45:06 +01:00
parent 6242a98f7a c58beb524e
commit 0ceccfb60b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/database/repo/action_merge.php
View File

@ -177,6 +177,7 @@
//TODO: GROUP_CONCAT(DISTINCT a.id_action ORDER BY a.id_action ASC) //TODO: GROUP_CONCAT(DISTINCT a.id_action ORDER BY a.id_action ASC)
$u = Table::get('user') $u = Table::get('user')
->whereIdWarehouse($id_warehouse)
->select('id_user') ->select('id_user')
->select('code'); ->select('code');
@ -184,7 +185,8 @@
->join('id_user', $u); ->join('id_user', $u);
$m = Table::get('machine') $m = Table::get('machine')
->whereId(5); ->whereIdWarehouse($id_warehouse)
->whereId($id_machine);
$mcm = Table::get('machine_cluster_merge') $mcm = Table::get('machine_cluster_merge')
->join('id_machine', $m); ->join('id_machine', $m);