Skip to content

Commit

Permalink
Fixed issue #07691: Javascript missing.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SamMousa
SamMousa committed Mar 20, 2013
1 parent b6dd042 commit e0689fe
Show file tree
Hide file tree
Showing 25 changed files with 78 additions and 76 deletions.
4 changes: 2 additions & 2 deletions application/controllers/admin/assessments.php
View file
Expand Up @@ -74,8 +74,8 @@ public function index($iSurveyID)
*/
protected function _renderWrappedTemplate($sAction = 'assessments', $aViewUrls = array(), $aData = array())
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'assessments.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'assessments.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");

parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
Expand Down
8 changes: 4 additions & 4 deletions application/controllers/admin/conditionsaction.php
View file
Expand Up @@ -1191,7 +1191,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
{

//self::_js_admin_includes($this->config->item("generalscripts").'jquery/jquery.checkgroup.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig("generalscripts").'jquery/jquery.checkgroup.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts").'jquery/jquery.checkgroup.js');
foreach ($scenarioresult as $scenarionr)
{
$scenariotext = "";
Expand Down Expand Up @@ -1606,7 +1606,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
if (isset($conditionsList) && is_array($conditionsList))
{
//TIBO
$this->getController()->_js_admin_includes(Yii::app()->getConfig("generalscripts").'jquery/jquery.multiselect.min.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts").'jquery/jquery.multiselect.min.js');

// TODO
$aViewUrls['output'] .= "<script type='text/javascript'>$(document).ready(function () { $('#copytomultiselect').multiselect( { autoOpen: true, noneSelectedText: '".$clang->gT("No questions selected")."', checkAllText: '".$clang->gT("Check all")."', uncheckAllText: '".$clang->gT("Uncheck all")."', selectedText: '# ".$clang->gT("selected")."', beforeclose: function(){ return false;},height: 200 } ); });</script>";
Expand Down Expand Up @@ -1915,8 +1915,8 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
$aViewUrls['output'] .= "</div>\n"; // end conditiontarget div


$this->getController()->_js_admin_includes(Yii::app()->getConfig("adminscripts").'conditions.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig("generalscripts").'jquery/lime-conditions-tabs.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("adminscripts").'conditions.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts").'jquery/lime-conditions-tabs.js');

if ($subaction == "editthiscondition" && isset($p_cid))
{
Expand Down
8 changes: 4 additions & 4 deletions application/controllers/admin/dataentry.php
View file
Expand Up @@ -910,8 +910,8 @@ public function editdata($subaction, $id, $surveyid, $language='')
}
$aDataentryoutput .="</div>";
$aDataentryoutput .= '</div>';
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.actual/jquery.actual.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'ranking.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.actual/jquery.actual.min.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'ranking.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('publicstyleurl') . 'ranking.css');
$aDataentryoutput .= "<script type='text/javascript'>\n"
. " <!--\n"
Expand Down Expand Up @@ -2163,8 +2163,8 @@ public function view($surveyid, $lang=NULL)
$answers[] = $ansrow;
}
$cdata['answers']=$answers;
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.actual/jquery.actual.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'ranking.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.actual/jquery.actual.min.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'ranking.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('publicstyleurl') . 'ranking.css');
unset($answers);
break;
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/emailtemplates.php
View file
Expand Up @@ -160,7 +160,7 @@ function update($iSurveyId)
*/
protected function _renderWrappedTemplate($sAction = 'emailtemplates', $aViewUrls = array(), $aData = array())
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'emailtemplates.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'emailtemplates.js');

$aData['display']['menu_bars']['surveysummary'] = 'editemailtemplates';

Expand Down
4 changes: 2 additions & 2 deletions application/controllers/admin/globalsettings.php
View file
Expand Up @@ -263,8 +263,8 @@ private function _checkSettings()
*/
protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $aData = array())
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jquery.selectboxes.min.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "globalsettings.js");
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . "jquery/jquery.selectboxes.min.js");
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "globalsettings.js");

parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}
Expand Down
6 changes: 3 additions & 3 deletions application/controllers/admin/labels.php
View file
Expand Up @@ -235,8 +235,8 @@ public function view($lid = 0)
$aData = array();

// Includes some javascript files
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'labels.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.json.min.js');
App()->getClientScript->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'labels.js');
App()->getClientScript->registerPackage('jquery-json');
// Checks if user have the sufficient rights to manage the labels
if (Permission::model()->hasGlobalPermission('global_labelsets','read'))
{
Expand Down Expand Up @@ -360,7 +360,7 @@ public function process()
*/
public function exportmulti()
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'labels.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'labels.js');
$this->_renderWrappedTemplate('labels', 'exportmulti_view');
}

Expand Down
10 changes: 5 additions & 5 deletions application/controllers/admin/participantsaction.php
View file
Expand Up @@ -61,7 +61,7 @@ private function _loadjqGrid($sScript = '', $aData = array())
App()->getClientScript()->registerPackage('jqgrid');
if (!empty($sScript))
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . $sScript . '.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . $sScript . '.js');
$this->_renderWrappedTemplate('participants', array('participantsPanel', $sScript), $aData);
}
}
Expand Down Expand Up @@ -244,8 +244,8 @@ function displayParticipants()
'urlsearch' => $urlSearch
);

$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jqGrid/js/i18n/grid.locale-en.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jqGrid/js/jquery.jqGrid.min.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jqGrid/js/i18n/grid.locale-en.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jqGrid/js/jquery.jqGrid.min.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.filter.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl') . 'displayParticipants.css');
Expand Down Expand Up @@ -1566,7 +1566,7 @@ function addToTokenattmap()
function attributeMap()
{
Yii::app()->loadHelper('common');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "attributeMap.js");
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "attributeMap.js");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl') ."attributeMap.css");

$iSurveyId = Yii::app()->request->getPost('survey_id');
Expand Down Expand Up @@ -1642,7 +1642,7 @@ function attributeMap()
function attributeMapToken()
{
Yii::app()->loadHelper('common');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "attributeMapToken.js");
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "attributeMapToken.js");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl') ."attributeMapToken.css");

$iSurveyId = Yii::app()->request->getQuery('sid');
Expand Down
18 changes: 9 additions & 9 deletions application/controllers/admin/question.php
View file
Expand Up @@ -254,10 +254,10 @@ public function answeroptions($surveyid, $gid, $qid)
$surveyid = sanitize_int($surveyid);
$qid = sanitize_int($qid);
$gid = sanitize_int($gid);
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.dd.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'answers.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.blockUI.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.selectboxes.min.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.dd.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'answers.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.blockUI.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.selectboxes.min.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/dd.css');

$aData['display']['menu_bars']['surveysummary'] = 'viewgroup';
Expand Down Expand Up @@ -424,10 +424,10 @@ public function subquestions($surveyid, $gid, $qid)
$aData['gid'] = $gid = sanitize_int($gid);
$aData['qid'] = $qid = sanitize_int($qid);

$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.dd.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.dd.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'subquestions.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.blockUI.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.selectboxes.min.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.blockUI.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.selectboxes.min.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/dd.css');
Yii::app()->session['FileManagerContext'] = "edit:answer:{$surveyid}";

Expand Down Expand Up @@ -820,7 +820,7 @@ public function index($sa, $surveyid, $gid, $qid=null)
$oqresult = Questions::model()->findAllByAttributes(array('sid' => $surveyid, 'gid' => $gid, 'language' => $baselang, 'parent_qid'=> 0), array('order' => 'question_order'));
$aData['oqresult'] = $oqresult;
}
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'questions.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'questions.js');

$aViewUrls['editQuestion_view'][] = $aData;
$aViewUrls['questionJavascript_view'][] = array('type' => $eqrow['type']);
Expand Down Expand Up @@ -1262,7 +1262,7 @@ function checkconditions(value, name, type, evt_type)
*/
protected function _renderWrappedTemplate($sAction = 'survey/Question', $aViewUrls = array(), $aData = array())
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.dd.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.dd.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/dd.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/questiongroup.php
View file
Expand Up @@ -115,7 +115,7 @@ function add($surveyid)
$baselang = Survey::model()->findByPk($surveyid)->language;
$grplangs[] = $baselang;
$grplangs = array_reverse($grplangs);
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'questiongroup.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'questiongroup.js');

$aData['display']['menu_bars']['surveysummary'] = 'addgroup';
$aData['surveyid'] = $surveyid;
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/admin/quotas.php
View file
Expand Up @@ -544,8 +544,8 @@ function getQuotaAnswers($iQuestionId, $iSurveyId, $iQuotaId)
*/
protected function _renderWrappedTemplate($sAction = 'quotas', $aViewUrls = array(), $aData = array())
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . '/jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . '/quotas.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . '/jquery/jquery.tablesorter.min.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . '/quotas.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");

parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/responses.php
View file
Expand Up @@ -920,7 +920,7 @@ private function _zipFiles($iSurveyID, $responseIds, $zipfilename,$language)
*/
protected function _renderWrappedTemplate($sAction='', $aViewUrls = array(), $aData = array())
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'browse.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'browse.js');

$aData['display']['menu_bars'] = false;
$aData['display']['menu_bars']['browse'] = Yii::app()->lang->gT('Browse responses'); // browse is independent of the above
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/admin/saved.php
View file
Expand Up @@ -33,8 +33,8 @@ public function view($iSurveyId)
die();
}

$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'saved.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'saved.js');

$aThisSurvey = getSurveyInfo($iSurveyId);
$aData['sSurveyName'] = $aThisSurvey['name'];
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/statistics.php
View file
Expand Up @@ -115,7 +115,7 @@ public function run($surveyid = 0, $subaction = null)


//Call the javascript file
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'statistics.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'statistics.js');

$aData['display']['menu_bars']['browse'] = $clang->gT("Quick statistics");

Expand Down
4 changes: 2 additions & 2 deletions application/controllers/admin/surveyadmin.php
View file
Expand Up @@ -1052,8 +1052,8 @@ private function _showReorderForm($iSurveyID)
$aData['aGroupsAndQuestions'] = $aGrouplist;
$aData['surveyid'] = $iSurveyID;

$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.ui.nestedSortable.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'organize.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.ui.nestedSortable.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'organize.js');

$this->_renderWrappedTemplate('survey', 'organizeGroupsAndQuestions_view', $aData);
}
Expand Down
8 changes: 4 additions & 4 deletions application/controllers/admin/surveypermission.php
View file
Expand Up @@ -36,8 +36,8 @@ function index($surveyid)
{
$aBaseSurveyPermissions=Permission::model()->getBasePermissions();
$userList=getUserList('onlyuidarray'); // Limit the user list for the samegrouppolicy
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'surveysecurity.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'surveysecurity.js');
$surveysecurity ="<div class='header ui-widget-header'>".$clang->gT("Survey permissions")."</div>\n";
$result2 = Permission::model()->getUserDetails($surveyid);
if(count($result2) > 0)
Expand Down Expand Up @@ -399,8 +399,8 @@ function set($surveyid)

if( Permission::model()->hasSurveyPermission($surveyid, 'surveysecurity', 'update') )
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') .'jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'surveysecurity.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') .'jquery/jquery.tablesorter.min.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'surveysecurity.js');
if ($action == "setsurveysecurity")
{
$query = "select users_name from {{users}} where uid=:uid";
Expand Down

0 comments on commit e0689fe

Please sign in to comment.