Skip to content

Commit

Permalink
Dev: replaced side state 'closed' by false
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac committed Jan 20, 2016
1 parent db33251 commit 5065ae0
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 54 deletions.
2 changes: 1 addition & 1 deletion application/controllers/admin/assessments.php
View file
Expand Up @@ -72,7 +72,7 @@ public function index($iSurveyID)
*/
protected function _renderWrappedTemplate($sAction = 'assessments', $aViewUrls = array(), $aData = array())
{
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$iSurveyID=$aData['surveyid'];
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
// TODO: Hide this, because submitting first form on the page means
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/conditionsaction.php
View file
Expand Up @@ -30,7 +30,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
Yii::app()->loadHelper("database");


$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['questionbar']['closebutton']['url'] = 'admin/questions/sa/view/surveyid/'.$iSurveyID.'/gid/'.$gid.'/qid/'.$qid;
Expand Down
12 changes: 6 additions & 6 deletions application/controllers/admin/dataentry.php
View file
Expand Up @@ -75,7 +75,7 @@ function vvimport()

$aData['display']['menu_bars']['browse'] = gT("Data entry");
$aData['title_bar']['title'] = gT("Data entry");
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$aData['menu']['edition'] = true;
$aData['menu']['import'] = true;
$aData['menu']['close'] = true;
Expand Down Expand Up @@ -300,7 +300,7 @@ public function import($surveyid)
$aData["surveyinfo"] = $surveyinfo;
$aData['title_bar']['title'] = gT('Browse responses').': '.$surveyinfo['surveyls_title'];

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$aData['menu']['edition'] = true;
$aData['menu']['import'] = true;
$aData['menu']['close'] = true;
Expand Down Expand Up @@ -1346,7 +1346,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
$aDataentryoutput .= "</form>\n";

$aViewUrls['output'] = $aDataentryoutput;
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$aData['menu']['edition'] = true;
$aData['menu']['save'] = true;
$aData['menu']['close'] = true;
Expand Down Expand Up @@ -1385,7 +1385,7 @@ public function delete()
Yii::app()->loadHelper('database');
$delresult = dbExecuteAssoc($delquery) or safeDie ("Couldn't delete record $id<br />\n");

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$aData['menu']['edition'] = true;
$aData['menu']['close'] = true;

Expand Down Expand Up @@ -1900,7 +1900,7 @@ public function insert()

$aData['dataentrymsgs'] = $aDataentrymsgs;

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;

$this->_renderWrappedTemplate('dataentry', 'insert', $aData);
}
Expand Down Expand Up @@ -2339,7 +2339,7 @@ public function view($surveyid, $lang=NULL)

$aViewUrls[] = 'active_html_view';

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$aData['menu']['edition'] = true;
$aData['menu']['save'] = true;
$aData['menu']['close'] = true;
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/emailtemplates.php
View file
Expand Up @@ -69,7 +69,7 @@ function index($iSurveyId)
$aData['defaulttexts'][$key] = templateDefaultTexts($aData['bplangs'][$key],$sEscapeMode);
}

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")";

Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/export.php
View file
Expand Up @@ -674,7 +674,7 @@ public function vvexport()
$aData["surveyinfo"] = $surveyinfo;
$aData['title_bar']['title'] = gT('Browse responses').': '.$surveyinfo['surveyls_title'];

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$aData['menu']['edition'] = true;
$aData['menu']['export'] = true;
$aData['menu']['close'] = true;
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/expressions.php
View file
Expand Up @@ -43,7 +43,7 @@ function index()

if(isset($iSurveyID))
{
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
if(Yii::app()->request->getQuery('gid')!='')
Expand Down
8 changes: 4 additions & 4 deletions application/controllers/admin/questiongroups.php
View file
Expand Up @@ -85,7 +85,7 @@ function import()
$aData['aImportResults'] = $aImportResults;
$aData['sExtension'] = $sExtension;
//$aData['display']['menu_bars']['surveysummary'] = 'importgroup';
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;

$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
Expand All @@ -106,7 +106,7 @@ function importView($surveyid)

$aData['action'] = $aData['display']['menu_bars']['gid_action'] = 'addgroup';
$aData['display']['menu_bars']['surveysummary'] = 'addgroup';
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$aData['sidemenu']['questiongroups'] = true;

$aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/listquestiongroups/surveyid/'.$surveyid;
Expand Down Expand Up @@ -155,7 +155,7 @@ function add($surveyid)
$aData['grplangs'] = $grplangs;
$aData['baselang'] = $baselang;

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/listquestiongroups/surveyid/'.$surveyid;
Expand Down Expand Up @@ -429,7 +429,7 @@ public function edit($surveyid, $gid)
$aData['tabtitles'] = $aTabTitles;
$aData['aBaseLanguage'] = $aBaseLanguage;

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";

Expand Down
8 changes: 4 additions & 4 deletions application/controllers/admin/quotas.php
View file
Expand Up @@ -93,7 +93,7 @@ function index($iSurveyId, $quickreport = false)

$aData['surveyid'] = $iSurveyID = $surveyid = sanitize_int($iSurveyId);

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";

Expand Down Expand Up @@ -383,7 +383,7 @@ function editquota($iSurveyId)

$aViewUrls[] = 'editquota_view';

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")";

Expand Down Expand Up @@ -444,7 +444,7 @@ function new_answer($iSurveyId, $sSubAction = 'new_answer')
$aViewUrls[] = 'newanswertwo_view';
}

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")";
$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
Expand All @@ -463,7 +463,7 @@ function newquota($iSurveyId)
$aData['langs'] = $aData['aLangs'];
$aData['baselang'] = $aData['sBaseLang'];

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")";
$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/responses.php
View file
Expand Up @@ -289,7 +289,7 @@ public function view($iSurveyID, $iId, $sBrowseLang = '')
}

$aViewUrls[] = 'browseidfooter_view';
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$aData['menu']['edition'] = true;
$aData['menu']['view'] = true;
$aData['menu']['close'] = true;
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/statistics.php
View file
Expand Up @@ -743,7 +743,7 @@ protected function _renderWrappedTemplate($sAction = 'export', $aViewUrls = arra
$aData['menu']['edition'] = true;
$aData['menu']['stats'] = true;
$aData['menu']['close'] = true;
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$iSurveyId = $aData['surveyid'];
$surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo;
$aData["surveyinfo"] = $surveyinfo;
Expand Down
10 changes: 5 additions & 5 deletions application/controllers/admin/surveyadmin.php
View file
Expand Up @@ -209,7 +209,7 @@ function editsurveysettings($iSurveyID)
$tempData = $aData;
$aData['data'] = $tempData;

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";

Expand Down Expand Up @@ -612,7 +612,7 @@ public function activate($iSurveyID)
$iSurveyID = (int) $iSurveyID;

$aData = array();
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$aData['aSurveysettings'] = getSurveyInfo($iSurveyID);
$aData['surveyid'] = $iSurveyID;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
Expand Down Expand Up @@ -921,10 +921,10 @@ public function delete($iSurveyID)
{
$aData = $aViewUrls = array();
$aData['surveyid'] = $iSurveyID = (int) $iSurveyID;
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;


if (Permission::model()->hasSurveyPermission($iSurveyID, 'survey', 'delete'))
Expand Down Expand Up @@ -1056,7 +1056,7 @@ public function editlocalsettings($iSurveyID)



$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";

Expand Down
14 changes: 7 additions & 7 deletions application/controllers/admin/surveypermission.php
View file
Expand Up @@ -35,7 +35,7 @@ function index($surveyid)
if(Permission::model()->hasSurveyPermission($surveyid,'surveysecurity','read'))
{

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
//$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
Expand Down Expand Up @@ -208,7 +208,7 @@ function index($surveyid)
}


$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";

Expand Down Expand Up @@ -327,7 +327,7 @@ function addusergroup($surveyid)
$aViewUrls['output'] = $addsummary;
}

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")";

Expand Down Expand Up @@ -412,7 +412,7 @@ function adduser($surveyid)
$aViewUrls['output'] = $addsummary;
}

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")";
//$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
Expand Down Expand Up @@ -550,7 +550,7 @@ function set($surveyid)
$this->getController()->error('Access denied');
}

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")";
$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
Expand Down Expand Up @@ -620,7 +620,7 @@ function delete($surveyid)
$aViewUrls['output'] = $addsummary;
}

$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")";
//$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
Expand Down Expand Up @@ -731,7 +731,7 @@ function surveyright($surveyid)
{
$this->getController()->error('Access denied');
}
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")";

Expand Down

0 comments on commit 5065ae0

Please sign in to comment.