diff --git a/controllers/copy.php b/controllers/copy.php index b2b26e2cb7d25cf0aa66d32012e03c84e79632ee..67dcff3e55a9ce4bd99dccefddab7169172fb9dc 100755 --- a/controllers/copy.php +++ b/controllers/copy.php @@ -254,18 +254,33 @@ class CopyController extends PluginController } if (Request::get("resource_assignments")) { - $statement = DBManager::get()->prepare(" - SELECT resource_id - FROM ( - SELECT resource_id, COUNT(*) AS number - FROM termine - INNER JOIN resources_assign ON (resources_assign.assign_user_id = termine.termin_id) - WHERE termine.metadate_id = :metadate_id - GROUP BY resources_assign.resource_id - ) AS counter - ORDER BY number DESC - LIMIT 1 - "); + if (StudipVersion::newerThan("4.4.99")) { + $statement = DBManager::get()->prepare(" + SELECT resource_id + FROM ( + SELECT resource_bookings.resource_id, COUNT(*) AS number + FROM termine + INNER JOIN resource_bookings ON (resource_bookings.range_id = termine.termin_id) + WHERE termine.metadate_id = :metadate_id + GROUP BY resource_bookings.resource_id + ) AS counter + ORDER BY number DESC + LIMIT 1 + "); + } else { + $statement = DBManager::get()->prepare(" + SELECT resource_id + FROM ( + SELECT resource_id, COUNT(*) AS number + FROM termine + INNER JOIN resources_assign ON (resources_assign.assign_user_id = termine.termin_id) + WHERE termine.metadate_id = :metadate_id + GROUP BY resources_assign.resource_id + ) AS counter + ORDER BY number DESC + LIMIT 1 + "); + } $statement->execute(array('metadate_id' => $cycledate->getId())); $resource_id = $statement->fetch(PDO::FETCH_COLUMN, 0); if ($resource_id) { @@ -274,6 +289,7 @@ class CopyController extends PluginController $singledate->bookRoom($resource_id); } } + } } } diff --git a/plugin.manifest b/plugin.manifest index c82045d23756fb7b9210243c16d5192d350c5030..15b10516051c52dc82653f60677d86cebd147f1a 100755 --- a/plugin.manifest +++ b/plugin.manifest @@ -1,6 +1,6 @@ pluginname=CourseCopy pluginclassname=CourseCopy -version=1.9 +version=1.9.1 origin=data-quest studipMinVersion=4.0 studipMaxVersion=5.1.99