From 309a0f6f9500a72cd043ded05ef8e5be38cf7c56 Mon Sep 17 00:00:00 2001 From: santipalenque Date: Wed, 3 Dec 2014 15:07:41 -0300 Subject: [PATCH] [spalenque] - #7812 *found these bugs when hitting sangria page, aparently some of the methods used here were deprecated --- .../sangria/SangriaPageDeploymentExtension.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/openstack/code/sangria/SangriaPageDeploymentExtension.php b/openstack/code/sangria/SangriaPageDeploymentExtension.php index 56fa5a3..8c79577 100644 --- a/openstack/code/sangria/SangriaPageDeploymentExtension.php +++ b/openstack/code/sangria/SangriaPageDeploymentExtension.php @@ -278,10 +278,10 @@ final class SangriaPageDeploymentExtension extends Extension { } function Deployments(){ - $sort = $this->request->getVar('sort'); - $sort_dir = $this->getSortDir('deployments'); - $date_from = Convert::raw2sql(trim($this->request->getVar('date-from'))); - $date_to = Convert::raw2sql(trim($this->request->getVar('date-to'))); + $sort = $this->owner->request->getVar('sort'); + $sort_dir = $this->owner->getSortDir('deployments'); + $date_from = Convert::raw2sql(trim($this->owner->request->getVar('date-from'))); + $date_to = Convert::raw2sql(trim($this->owner->request->getVar('date-to'))); $sort_query = ''; if (!empty($sort)) { switch (strtolower(trim($sort))) { @@ -319,14 +319,14 @@ final class SangriaPageDeploymentExtension extends Extension { function DeploymentsSurvey(){ $sqlQuery = new SQLQuery(); - $sqlQuery->select = array('DeploymentSurvey.*'); - $sqlQuery->from = array("DeploymentSurvey, Deployment, Org"); - $sqlQuery->where = array("Deployment.DeploymentSurveyID = DeploymentSurvey.ID + $sqlQuery->setSelect(array('DeploymentSurvey.*')); + $sqlQuery->setFrom(array("DeploymentSurvey, Deployment, Org")); + $sqlQuery->setWhere(array("Deployment.DeploymentSurveyID = DeploymentSurvey.ID AND Deployment.IsPublic = 1 AND Org.ID = DeploymentSurvey.OrgID AND DeploymentSurvey.Title IS NOT NULL - "); - $sqlQuery->orderby = 'Org.Name'; + ")); + $sqlQuery->setOrderBy('Org.Name'); $result = $sqlQuery->execute();