openinfra/openstackweb
Code Issues Proposed changes

[spalenque] - #7812 *found these bugs when hitting sangria page, aparently some of the methods used here were deprecated

Browse Source
This commit is contained in:
santipalenque 2014-12-03 15:07:41 -03:00 committed by Sebastian Marcet
parent 30f28eda62
commit 309a0f6f95
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openstack/code/sangria/SangriaPageDeploymentExtension.php
View File

@ -278,10 +278,10 @@ final class SangriaPageDeploymentExtension extends Extension {
} }
function Deployments(){ function Deployments(){
$sort = $this->request->getVar('sort'); $sort = $this->owner->request->getVar('sort');
$sort_dir = $this->getSortDir('deployments'); $sort_dir = $this->owner->getSortDir('deployments');
$date_from = Convert::raw2sql(trim($this->request->getVar('date-from'))); $date_from = Convert::raw2sql(trim($this->owner->request->getVar('date-from')));
$date_to = Convert::raw2sql(trim($this->request->getVar('date-to'))); $date_to = Convert::raw2sql(trim($this->owner->request->getVar('date-to')));
$sort_query = ''; $sort_query = '';
if (!empty($sort)) { if (!empty($sort)) {
switch (strtolower(trim($sort))) { switch (strtolower(trim($sort))) {
@ -319,14 +319,14 @@ final class SangriaPageDeploymentExtension extends Extension {
function DeploymentsSurvey(){ function DeploymentsSurvey(){
$sqlQuery = new SQLQuery(); $sqlQuery = new SQLQuery();
$sqlQuery->select = array('DeploymentSurvey.*'); $sqlQuery->setSelect(array('DeploymentSurvey.*'));
$sqlQuery->from = array("DeploymentSurvey, Deployment, Org"); $sqlQuery->setFrom(array("DeploymentSurvey, Deployment, Org"));
$sqlQuery->where = array("Deployment.DeploymentSurveyID = DeploymentSurvey.ID $sqlQuery->setWhere(array("Deployment.DeploymentSurveyID = DeploymentSurvey.ID
AND Deployment.IsPublic = 1 AND Deployment.IsPublic = 1
AND Org.ID = DeploymentSurvey.OrgID AND Org.ID = DeploymentSurvey.OrgID
AND DeploymentSurvey.Title IS NOT NULL AND DeploymentSurvey.Title IS NOT NULL
"); "));
$sqlQuery->orderby = 'Org.Name'; $sqlQuery->setOrderBy('Org.Name');
$result = $sqlQuery->execute(); $result = $sqlQuery->execute();