Fixed #6958: Error 2048 intermittently when adding tokens to CPD from…

… survey with custom attributes set
LimeSurvey · Nov 28, 2012 · 5b9c8ee · 5b9c8ee
1 parent 1d2cdb8
commit 5b9c8ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php
@@ -1883,6 +1883,8 @@ function attributeMap()
     function attributeMapToken()
     {
         Yii::app()->loadHelper('common');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "attributeMapToken.js");
+        $this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl') ."attributeMapToken.css");
 
         $iSurveyId = Yii::app()->request->getQuery('sid');
         $attributes = ParticipantAttributeNames::model()->getAttributes();

diff --git a/application/views/admin/participants/attributeMapToken_view.php b/application/views/admin/participants/attributeMapToken_view.php
@@ -1,9 +1,3 @@
-
-<link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->getConfig('adminstyleurl') . "attributeMapToken.css" ?>" />
-<script src="<?php echo Yii::app()->getConfig('generalscripts') . "jquery/jquery.js" ?>" type="text/javascript"></script>
-<script src="<?php echo Yii::app()->getConfig('generalscripts') . "jquery/jquery-ui.js" ?>" type="text/javascript"></script>
-<script src="<?php echo Yii::app()->getConfig('generalscripts') . "jquery/jquery.ui.nestedSortable.js" ?>" type="text/javascript"></script>
-<script src="<?php echo Yii::app()->getConfig('adminscripts') . "attributeMapToken.js" ?>" type="text/javascript"></script>
 <script type="text/javascript">
     var redUrl = "<?php echo Yii::app()->baseUrl . "/index.php/admin/participants/displayParticipants"; ?>";
     var copyUrl = "<?php echo Yii::app()->baseUrl . "/index.php/admin/participants/addToCentral"; ?>";