summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-05-31 13:05:44 +0200
committerBjörn Geiger2011-05-31 13:05:44 +0200
commit2ff28dd224356f4d6209fa3e48f98162d8bb4f5f (patch)
tree5bd95799f21dfa078d1364ba4eb9ed6c5c921b29
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/pbs2 (diff)
downloadpbs2-2ff28dd224356f4d6209fa3e48f98162d8bb4f5f.tar.gz
pbs2-2ff28dd224356f4d6209fa3e48f98162d8bb4f5f.tar.xz
pbs2-2ff28dd224356f4d6209fa3e48f98162d8bb4f5f.zip
Clients werden nun auch über die PoolApi übertragen
-rw-r--r--application/controllers/ResourceController.php17
1 files changed, 16 insertions, 1 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 1076e99..1433281 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -669,8 +669,10 @@ class ResourceController extends Zend_Controller_Action
}
$pool = new Application_Model_Pool();
$poolMapper = new Application_Model_PoolMapper();
+ $poolEntriesMapper = new Application_Model_PoolEntriesMapper();
+ $clientMapper = new Application_Model_ClientMapper();
+ $client = new Application_Model_Client();
$groupID = $this->membership->getGroupID();
-
$pool = $poolMapper->findBy(array('groupid' => $groupID));
if($pool == null){
@@ -688,6 +690,19 @@ class ResourceController extends Zend_Controller_Action
$xml .= "\t\t\t<title>" . $poolobj->getTitle() . "</title>\n";
$xml .= "\t\t\t<description>" . $poolobj->getDescription() . "</description>\n";
$xml .= "\t\t\t<location>" . $poolobj->getLocation() . "</location>\n";
+ $poolentries = $poolEntriesMapper->findBy(array('poolID' => $poolobj->getID()));
+ $xml .= "\t\t\t<clients>\n";
+ foreach($poolentries as $poolentry) {
+ $clientMapper->find($poolentry->getClientID(), $client);
+ $xml .= "\t\t\t\t<client>\n";
+ $xml .= "\t\t\t\t\t<clientID>" . $client->getID() . "</clientID>\n";
+ $xml .= "\t\t\t\t\t<groupID>" . $client->getGroupID() . "</groupID>\n";
+ $xml .= "\t\t\t\t\t<macadress>" . $client->getMacadress() . "</macadress>\n";
+ $xml .= "\t\t\t\t\t<hardwarehash>" . $client->getHardwarehash() . "</hardwarehash>\n";
+ $xml .= "\t\t\t\t\t<created>" . $client->getCreated() . "</created>\n";
+ $xml .= "\t\t\t\t</client>\n";
+ }
+ $xml .= "\t\t\t</clients>\n";
$xml .= "\t\t</pool>\n";
}
$xml .= "\t</poollist>\n";