[icinga-checkins] icinga.org: icinga-web/r1.5: * Fixed missing default conenction name in DataStoreModel

git at icinga.org git at icinga.org
Wed Aug 24 09:27:10 CEST 2011


Module: icinga-web
Branch: r1.5
Commit: 3eb3c6e944e7e841cc2ffebebe4e30e0c79768d1
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=3eb3c6e944e7e841cc2ffebebe4e30e0c79768d1

Author: Jannis Moßhanner <jannis.mosshammer at netways.de>
Date:   Tue Aug 23 16:43:35 2011 +0200

* Fixed missing default conenction name in DataStoreModel

---

 .../datastore/IcingaApiDataStoreModel.class.php    |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/modules/Api/lib/datastore/IcingaApiDataStoreModel.class.php b/app/modules/Api/lib/datastore/IcingaApiDataStoreModel.class.php
index 79f904a..bd31615 100644
--- a/app/modules/Api/lib/datastore/IcingaApiDataStoreModel.class.php
+++ b/app/modules/Api/lib/datastore/IcingaApiDataStoreModel.class.php
@@ -20,7 +20,7 @@ class IcingaApiActionNotAvailableException extends AppKitException {};
 **/
 class IcingaApiDataStoreModel extends AbstractDataStoreModel {
 
-    protected $connectionName;
+    protected $connectionName = 'icinga';
     protected $database = "icinga";
     /**
     * The possible result types
@@ -172,8 +172,8 @@ class IcingaApiDataStoreModel extends AbstractDataStoreModel {
     protected function createRequestDescriptor() {
         $DBALMetaManager = AgaviContext::getInstance()->getModel("DBALMetaManager","Api");
         $DBALMetaManager->switchIcingaDatabase($this->connectionName);
-
-        return IcingaDoctrine_Query::create();
+      //  $connection = Doctrine_Manager::getInstance()->getConnection($this->connectionName);
+        return IcingaDoctrine_Query::create(/*$connection*/);
     }
 
 }





More information about the icinga-checkins mailing list