diff --git a/application/commands/InstallCommand.php b/application/commands/InstallCommand.php
index f75c83a2767..e397a432225 100644
--- a/application/commands/InstallCommand.php
+++ b/application/commands/InstallCommand.php
@@ -13,109 +13,38 @@
*/
class InstallCommand extends CConsoleCommand
{
+ /**
+ *
+ * @var CDbConnection
+ */
public $connection;
public function run($sArgument)
{
if (!isset($sArgument) || !isset($sArgument[0]) || !isset($sArgument[1]) || !isset($sArgument[2]) || !isset($sArgument[3])) die('You have to set admin/password/full name and email address on the command line like this: php starter.php adminname mypassword fullname emailaddress');
Yii::import('application.helpers.common_helper', true);
- $aConfig=Yii::app()->getComponents(false);
- $bDatabaseExists=true;
+
try
{
- $this->connection=new CDbConnection($aConfig['db']['connectionString'],$aConfig['db']['username'],$aConfig['db']['password']);
+ $this->connection = App()->getDb();
$this->connection->active=true;
}
- catch(Exception $e){
- $bDatabaseExists=false;
- $sConnectionString=preg_replace('/dbname=([^;]*)/', '', $aConfig['db']['connectionString']);
- try
- {
- $this->connection=new CDbConnection($sConnectionString, $aConfig['db']['username'], $aConfig['db']['password']);
- $this->connection->active=true;
- }
- catch(Exception $e){
- echo "Invalid access data. Check your config.php db access data"; die();
- }
-
+ catch(CDbException $e){
+ $this->createDatabase();
};
- $sDatabaseType = substr($aConfig['db']['connectionString'],0,strpos($aConfig['db']['connectionString'],':'));
- $sDatabaseName= $this->getDBConnectionStringProperty('dbname');
-
- if (!$bDatabaseExists)
- {
-
- $createDb = true; // We are thinking positive
- switch ($sDatabaseType)
- {
- case 'mysqli':
- case 'mysql':
- try
- {
- $this->connection->createCommand("CREATE DATABASE `$sDatabaseName` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci")->execute();
- }
- catch(Exception $e)
- {
- $createDb=false;
- }
- break;
-
- case 'dblib':
- case 'mssql':
- case 'odbc':
- try
- {
- $this->connection->createCommand("CREATE DATABASE [$sDatabaseName];")->execute();
- }
- catch(Exception $e)
- {
- $createDb=false;
- }
- break;
- case 'postgres':
- try
- {
- $this->connection->createCommand("CREATE DATABASE \"$sDatabaseName\" ENCODING 'UTF8'")->execute();
- }
- catch (Exception $e)
- {
- $createdb = false;
- }
- break;
- default:
- try
- {
- $this->connection->createCommand("CREATE DATABASE $sDatabaseName")->execute();
- }
- catch(Exception $e)
- {
- $createDb=false;
- }
- break;
- }
- if (!$createDb)
- {
- echo 'Database could not be created because it either existed or you have no permissions'; die();
- }
- else
- {
- $this->connection=new CDbConnection($aConfig['db']['connectionString'],$aConfig['db']['username'],$aConfig['db']['password']);
- $this->connection->active=true;
- }
- }
$this->connection->charset = 'utf8';
- switch ($sDatabaseType) {
+ switch ($this->connection->driverName) {
case 'mysql':
case 'mysqli':
- $this->connection->createCommand("ALTER DATABASE ". $this->connection->quoteTableName($sDatabaseName) ." DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;")->execute();
+ $this->connection->createCommand("ALTER DATABASE ". $this->connection->quoteTableName($this->getDBConnectionStringProperty('dbname')) ." DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;")->execute();
$sql_file = 'mysql';
break;
case 'pgsql':
if (version_compare($this->connection->getServerVersion(),'9','>=')) {
- $this->connection->createCommand("ALTER DATABASE ". $this->connection->quoteTableName($sDatabaseName) ." SET bytea_output='escape';")->execute();
+ $this->connection->createCommand("ALTER DATABASE ". $this->connection->quoteTableName($this->getDBConnectionStringProperty('dbname')) ." SET bytea_output='escape';")->execute();
}
$sql_file = 'pgsql';
break;
@@ -124,10 +53,10 @@ public function run($sArgument)
$sql_file = 'mssql';
break;
default:
- throw new Exception(sprintf('Unkown database type "%s".', $sDatabaseType));
+ throw new Exception(sprintf('Unkown database type "%s".', $this->getDBConnectionStringProperty('dbname')));
}
- $this->_executeSQLFile(dirname(Yii::app()->basePath).'/installer/sql/create-'.$sql_file.'.sql', $aConfig['db']['tablePrefix']);
- $this->connection->createCommand()->insert($aConfig['db']['tablePrefix'].'users', array(
+ $this->_executeSQLFile(dirname(Yii::app()->basePath).'/installer/sql/create-'.$sql_file.'.sql');
+ $this->connection->createCommand()->insert($this->connection->tablePrefix.'users', array(
'users_name'=>$sArgument[0],
'password'=>hash('sha256',$sArgument[1]),
'full_name'=>$sArgument[2],
@@ -135,7 +64,7 @@ public function run($sArgument)
'lang'=>'auto',
'email'=>$sArgument[3]
));
- $this->connection->createCommand()->insert($aConfig['db']['tablePrefix'].'permissions', array(
+ $this->connection->createCommand()->insert($this->connection->tablePrefix.'permissions', array(
'entity'=>'global',
'entity_id'=>0,
'uid'=>1,
@@ -149,7 +78,7 @@ public function run($sArgument)
));
}
- function _executeSQLFile($sFileName, $sDatabasePrefix)
+ function _executeSQLFile($sFileName)
{
echo $sFileName;
$aMessages = array();
@@ -168,7 +97,7 @@ function _executeSQLFile($sFileName, $sDatabasePrefix)
if (substr($sLine, $iLineLength-1, 1) == ';') {
$line = substr($sLine, 0, $iLineLength-1);
$sCommand .= $sLine;
- $sCommand = str_replace('prefix_', $sDatabasePrefix, $sCommand); // Table prefixes
+ $sCommand = str_replace('prefix_', $this->connection->tablePrefix, $sCommand); // Table prefixes
try {
$this->connection->createCommand($sCommand)->execute();
@@ -190,14 +119,57 @@ function _executeSQLFile($sFileName, $sDatabasePrefix)
function getDBConnectionStringProperty($sProperty)
{
- $aConfig=Yii::app()->getComponents(false);
// Yii doesn't give us a good way to get the database name
- preg_match('/'.$sProperty.'=([^;]*)/', $aConfig['db']['connectionString'], $aMatches);
+ preg_match('/'.$sProperty.'=([^;]*)/', $this->connection->connectionString, $aMatches);
if ( count($aMatches) === 0 ) {
return null;
}
return $aMatches[1];
}
+
+ protected function createDatabase()
+ {
+ $connectionString = $this->connection->connectionString;
+ $this->connection->connectionString = preg_replace('/dbname=([^;]*)/', '', $connectionString);
+ try
+ {
+ $this->connection->active=true;
+ }
+ catch(Exception $e){
+ echo "Invalid access data. Check your config.php db access data"; die();
+ }
+
+ $sDatabaseName= $this->getDBConnectionStringProperty('dbname');
+ try {
+ switch ($this->connection->driverName)
+ {
+ case 'mysqli':
+ case 'mysql':
+ $this->connection->createCommand("CREATE DATABASE `$sDatabaseName` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci")->execute();
+ break;
+ case 'dblib':
+ case 'mssql':
+ case 'odbc':
+ $this->connection->createCommand("CREATE DATABASE [$sDatabaseName];")->execute();
+ break;
+ case 'postgres':
+ $this->connection->createCommand("CREATE DATABASE \"$sDatabaseName\" ENCODING 'UTF8'")->execute();
+ break;
+ default:
+ $this->connection->createCommand("CREATE DATABASE $sDatabaseName")->execute();
+ break;
+ }
+ }
+ catch (Exception $e)
+ {
+ throw new CException('Database could not be created because it either existed or you have no permissions');
+ }
+
+ $this->connection->active = false;
+ $this->connection->connectionString = $connectionString;
+ $this->connection->active = true;
+ }
+
}
?>
\ No newline at end of file
diff --git a/application/controllers/SurveysController.php b/application/controllers/SurveysController.php
index dc62eace8a7..711728fae89 100644
--- a/application/controllers/SurveysController.php
+++ b/application/controllers/SurveysController.php
@@ -7,6 +7,18 @@ class SurveysController extends LSYii_Controller
{
public $layout = 'bare';
public $defaultAction = 'publicList';
+
+ public function actionOrganize($surveyId)
+ {
+ $this->layout = 'main';
+ $groups = QuestionGroup::model()->findAllByAttributes(array(
+ 'sid' => $surveyId
+ ));
+ $this->render('organize', compact('groups'));
+ }
+
+
+
public function actionPublicList($lang = null)
{
$this->sessioncontrol();
diff --git a/application/controllers/admin/emailtemplates.php b/application/controllers/admin/emailtemplates.php
index f0ff12e5c78..4c1661d2415 100644
--- a/application/controllers/admin/emailtemplates.php
+++ b/application/controllers/admin/emailtemplates.php
@@ -103,7 +103,7 @@ function update($iSurveyId)
foreach ($attachments as $index => &$attachment)
{
// We again take the real path.
- $localName = realpath(str_replace($uploadUrl, $uploadDir, $attachment['url']));
+ $localName = realpath(urldecode(str_replace($uploadUrl, $uploadDir, $attachment['url'])));
if ($localName !== false)
{
if (strpos($localName, $uploadDir) === 0)
diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php
index 50791ac716a..966c4b5b797 100644
--- a/application/controllers/admin/participantsaction.php
+++ b/application/controllers/admin/participantsaction.php
@@ -681,13 +681,14 @@ function getaddtosurveymsg()
*/
function getSearchIDs()
{
- $searchcondition = basename(Yii::app()->request->getPost('searchcondition')); // get the search condition from the URL
+ $searchcondition = Yii::app()->request->getPost('searchcondition'); // get the search condition from the URL
+ $sSearchURL = basename(Yii::app()->request->getPost('searchURL')); // get the search condition from the URL
/* a search contains posted data inside $_POST['searchcondition'].
* Each separate query is made up of 3 fields, separated by double-pipes ("|")
* EG: fname||eq||jason||lname||ct||c
*
*/
- if ($searchcondition != 'getParticipants_json') // if there is a search condition present
+ if ($sSearchURL != 'getParticipants_json') // if there is a search condition present
{
$participantid = "";
$condition = explode("||", $searchcondition); // explode the condition to the array
@@ -735,7 +736,7 @@ function exporttocsv()
{
if (Yii::app()->request->getPost('searchcondition','') != '') // if there is a search condition then only the participants that match the search criteria are counted
{
- $condition = explode("||", $searchcondition);
+ $condition = explode("%7C%7C", Yii::app()->request->getPost('searchcondition',''));
$search = Participant::model()->getParticipantsSearchMultipleCondition($condition);
} else {
$search = null;
diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php
index 22061d9b125..6e6adbcb842 100644
--- a/application/controllers/admin/statistics.php
+++ b/application/controllers/admin/statistics.php
@@ -496,13 +496,13 @@ function listcolumn($surveyid, $column, $sortby="", $sortmethod="", $sorttype=""
{
Yii::app()->loadHelper('admin/statistics');
$helper = new statistics_helper();
- $output = $helper->_listcolumn($surveyid, $column, $sortby, $sortmethod, $sorttype);
+ $aData['data']=$helper->_listcolumn($surveyid, $column, $sortby, $sortmethod, $sorttype);
$aData['surveyid']=$surveyid;
- $aData['data']=$output;
$aData['column']=$column;
$aData['sortby']=$sortby;
$aData['sortmethod']=$sortmethod;
$aData['sorttype']=$sorttype;
+ App()->getClientScript()->reset();
$this->getController()->render('export/statistics_browse_view', $aData);
}
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
index 50c033d300d..0c3e972a36d 100644
--- a/application/controllers/admin/tokens.php
+++ b/application/controllers/admin/tokens.php
@@ -1903,7 +1903,7 @@ function import($iSurveyId)
self::_newtokentable($iSurveyId);
}
- App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'tokens.js');
+ App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'tokensimport.js');
$aEncodings =aEncodingsArray();
if (Yii::app()->request->getPost('submit'))
{
@@ -2086,6 +2086,10 @@ function import($iSurveyId)
//if(in_array($key,$oToken->attributes)) Not needed because we filter attributes before
$oToken->$key=$value;
}
+ // Some default value : to be moved to Token model rules in future release ?
+ // But think we have to accept invalid email etc ... then use specific scenario
+ $writearray['emailstatus']=isset($writearray['emailstatus'])?$writearray['emailstatus']:"OK";
+ $writearray['language']=isset($writearray['language'])?$writearray['language']:$sBaseLanguage;
$ir=$oToken->save();
if (!$ir)
{
diff --git a/application/extensions/Menu/MenuWidget.php b/application/extensions/Menu/MenuWidget.php
index 8125aa0d6f5..6b3eb3205de 100644
--- a/application/extensions/Menu/MenuWidget.php
+++ b/application/extensions/Menu/MenuWidget.php
@@ -55,11 +55,14 @@ protected function menuMain()
'image' => 'home.png',
);
$menu['items']['left'][] = 'separator';
- $menu['items']['left'][] = array(
- 'href' => array('admin/user'),
- 'alt' => gT('Manage survey administrators'),
- 'image' => 'security.png',
- );
+ if(Permission::model()->hasGlobalPermission('users','read'))
+ {
+ $menu['items']['left'][] = array(
+ 'href' => array('admin/user'),
+ 'alt' => gT('Manage survey administrators'),
+ 'image' => 'security.png',
+ );
+ }
$menu['items']['left'][] = $this->userGroups();
$menu['items']['left'][] = $this->globalSettings();
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index d17c3e203e4..6e81e87fab5 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -11,10 +11,6 @@
* See COPYRIGHT.php for copyright notices and details.
*/
-// Security Checked: POST, GET, SESSION, REQUEST, returnGlobal, DB
-
-//if (!isset($homedir) || isset($_REQUEST['$homedir'])) {die("Cannot run this script directly");}
-
/*
* Let's explain what this strange $ia var means
*
diff --git a/application/models/Participant.php b/application/models/Participant.php
index 59a135decca..eb5c8ea170c 100644
--- a/application/models/Participant.php
+++ b/application/models/Participant.php
@@ -284,10 +284,9 @@ private function getParticipantsSelectCommand($count = false, $attid, $search =
{
if(!is_null($search) && strpos($search->condition,'attribute'.$aAttribute['attribute_id'])!==false)
{
- $attid[]=$aAttribute;
+ $attid[$aAttribute['attribute_id']]=$aAttribute;
}
}
- $attid=array_unique($attid);
// Add survey count subquery
$subQuery = Yii::app()->db->createCommand()
->select('count(*) survey')
@@ -295,17 +294,16 @@ private function getParticipantsSelectCommand($count = false, $attid, $search =
->where('sl.participant_id = p.participant_id');
$selectValue[] = sprintf('(%s) survey',$subQuery->getText());
array_push($joinValue,"left join {{users}} luser ON luser.uid=p.owner_uid");
- foreach($attid as $key=>$attid)
+ foreach($attid as $iAttributeID=>$aAttributeDetails)
{
- $attid = $attid['attribute_id'];
$sDatabaseType = Yii::app()->db->getDriverName();
if ($sDatabaseType=='mssql' || $sDatabaseType=="sqlsrv" || $sDatabaseType == 'dblib')
{
- $selectValue[]= "cast(attribute".$attid.".value as varchar(max)) as a".$attid;
+ $selectValue[]= "cast(attribute".$iAttributeID.".value as varchar(max)) as a".$iAttributeID;
} else {
- $selectValue[]= "attribute".$attid.".value as a".$attid;
+ $selectValue[]= "attribute".$iAttributeID.".value as a".$iAttributeID;
}
- array_push($joinValue,"LEFT JOIN {{participant_attribute}} attribute".$attid." ON attribute".$attid.".participant_id=p.participant_id AND attribute".$attid.".attribute_id=".$attid);
+ array_push($joinValue,"LEFT JOIN {{participant_attribute}} attribute".$iAttributeID." ON attribute".$iAttributeID.".participant_id=p.participant_id AND attribute".$iAttributeID.".attribute_id=".$iAttributeID);
}
$aConditions = array(); // this wil hold all conditions
diff --git a/application/models/ParticipantAttributeName.php b/application/models/ParticipantAttributeName.php
index 73395e43388..3f74b3d9935 100644
--- a/application/models/ParticipantAttributeName.php
+++ b/application/models/ParticipantAttributeName.php
@@ -181,7 +181,7 @@ function getVisibleAttributes($sLanguageFilter=null)
$language=$langs[0]->lang;
$attribute_name=$langs[0]->attribute_name;
}
- $output[]=array("attribute_id"=>$id->attribute_id,
+ $output[$id->attribute_id]=array("attribute_id"=>$id->attribute_id,
"attribute_type"=>$id->attribute_type,
"visible"=>$id->visible,
"attribute_name"=>$attribute_name,
diff --git a/application/views/admin/super/adminmenu.php b/application/views/admin/super/adminmenu.php
index ad0635af512..405f55bac56 100644
--- a/application/views/admin/super/adminmenu.php
+++ b/application/views/admin/super/adminmenu.php
@@ -25,9 +25,13 @@
- ">
-
hasGlobalPermission('users','read'))
+ {?>
+ ">
+
+ hasGlobalPermission('usergroups','read'))
{?>
">
diff --git a/application/views/admin/usergroup/usergroupbar_view.php b/application/views/admin/usergroup/usergroupbar_view.php
index 8fdc23c956a..9a21de1fd7b 100644
--- a/application/views/admin/usergroup/usergroupbar_view.php
+++ b/application/views/admin/usergroup/usergroupbar_view.php
@@ -50,7 +50,7 @@
- hasGlobalPermission('superadmin','read'))
+ hasGlobalPermission('usergroups','create'))
{ ?>
diff --git a/docs/release_notes.txt b/docs/release_notes.txt
index 457af86d651..b3326ffcbe1 100644
--- a/docs/release_notes.txt
+++ b/docs/release_notes.txt
@@ -59,6 +59,86 @@ Thank you to everyone who helped with this new release!
CHANGE LOG
------------------------------------------------------
+Changes from 2.05+ (build 140404) to 2.05+ (build 140414) Apr 14, 2014
+-New feature #8659: Configurable proxy for ComfortUpdate (mfaber)
+-Fixed issue #8908: Javascript error in import tokens page (Carsten Schmitz)
+-Fixed issue #8925: Exporting a filtered list results in SQL error (Carsten Schmitz)
+-Fixed issue #8926: Add filtered participants to a survey adds ALL participants to the survey (Carsten Schmitz)
+-Fixed issue #8945: Only a super administrator can manage user groups (Carsten Schmitz)
+-Fixed issue #8955: YearRange for date picker not set (mfaber)
+-Fixed issue #8960: Proper installation fails if db password contains certain characters (Carsten Schmitz)
+-Fixed issue: Files with spaces cannot be attached to email templates (Carsten Schmitz)
+#Updated translation: Basque by ikt
+#Updated translation: Chinese (Hong Kong) (Traditional) by achan
+#Updated translation: Dutch by Han
+#Updated translation: Dutch (Informal) by Han
+#Updated translation: Estonian by klaster
+#Updated translation: German by c_schmitz
+#Updated translation: Greek by kiolalis
+#Updated translation: Greek by kiolalis, christof75, theseek3r
+#Updated translation: Japanese by yamatt
+#Updated translation: Norwegian (Bokmål) by pmonstad
+#Updated translation: Norwegian (Nynorsk) by pmonstad
+#Updated translation: Papiamento (Curaçao and Bonaire) by indigoblueconsult
+#Updated translation: Polish by elisa
+#Updated translation: Russian by vipgroup
+#Updated translation: Swedish by maxzomborszki
+#Updated translation: Ukrainian by Rusya, kuzenka167
+
+Changes from 2.05+ (build 140320) to 2.05+ (build 140404) Apr 04, 2014
+-Fixed issue #8784: get_summary RPC routine only delivering one value at a time (Carsten Schmitz)
+-Fixed issue #8856: It should not add the datatype tag for the key value which breakes response when converted to array (ravindrakhokharia)
+-Fixed issue #8857: Fixed issue of type casting and return number value (ravindrakhokharia)
+-Fixed issue #8878: Cell width faulty in Array 10 point question type (Carsten Schmitz)
+-Fixed issue #8887: Question text and help : unable to use html entities of < and > for admin (Denis Chenu)
+-Fixed issue #8890: Automatic fill of answer code removes 1st character (Carsten Schmitz)
+-Fixed issue #8892: Missing translation (Carsten Schmitz)
+-Fixed issue #8893: Missing translation (Carsten Schmitz)
+-Fixed issue #8894: Error when importing an invalid file (Carsten Schmitz)
+-Fixed issue #8895: Missing translation (Carsten Schmitz)
+-Fixed issue #8896: JS file inclusion missing in template editor preview of startpage.pstpl (Carsten Schmitz)
+-Fixed issue #8899: When importing token data from CSV file the invitation date is ignored (Denis Chenu)
+-Fixed issue #8902: CPD Editing shared Participants results in duplicates (Carsten Schmitz)
+-Fixed issue #8903: Error when sharing an already shared participant (Carsten Schmitz)
+-Fixed issue #8910: Fixed added to output/render output of file data, using render routine of Bigfile class (ravindrakhokharia)
+-Fixed issue #8914: Allow to click next/submit more than once (Denis Chenu)
+-Fixed issue #8917: Error in R Export plugin (Menno Dekker)
+-Fixed issue #8917: Error in R Export plugin - patch by peterhol (Carsten Schmitz)
+-Fixed issue #8918: Paticipant responses contain only question marks (Carsten Schmitz)
+-Fixed issue #8922: KCFinder CSRF not always working (Menno Dekker)
+-Fixed issue #8923: Survey logic file for group : don't show relevance of Questions (Denis Chenu)
+-Fixed issue: Absolute URL for assets may cause HTTPS mixed content error (Carsten Schmitz)
+-Fixed issue: During vv export, output data was buffered and lead to out of memory errors when exporting large quantities of answers. (Alexis Bezverkhyy)
+-Fixed issue: Question index activated on update (Carsten Schmitz)
+-Fixed issue: Unable to redisplay duplcate token attribute (Denis Chenu)
+-New translation: Added Papiamento (pap-AW and pap-CW) (Ace Suares)
+#Updated translation: Albanian by lulzimavdiu
+#Updated translation: Armenian by Satenik
+#Updated translation: Catalan by valdomir
+#Updated translation: Chinese (Hong Kong) (Traditional) by superleo888
+#Updated translation: Czech by slansky
+#Updated translation: Czech (Informal) by slansky
+#Updated translation: Dutch by Han
+#Updated translation: Dutch (Informal) by Han
+#Updated translation: French (France) by arnaud21
+#Updated translation: German by Mazi, c_schmitz
+#Updated translation: German (Informal) by senden9, c_schmitz
+#Updated translation: Greek by kiolalis
+#Updated translation: Italian by lfanfoni
+#Updated translation: Italian (Informal) by mzzvtr, lfanfoni
+#Updated translation: Japanese by yamatt, nomoto
+#Updated translation: Latvian by vipgroup, marcic
+#Updated translation: Malay by apisznasdin, betakerotin
+#Updated translation: Norwegian (Bokmal) by pmonstad
+#Updated translation: Norwegian (Nynorsk) by pmonstad
+#Updated translation: Papiamento (Curacao and Bonaire) by indigoblueconsult
+#Updated translation: Polish by elisa
+#Updated translation: Russian by ddrmoscow, vipgroup
+#Updated translation: Spanish (Spain) by valdomir
+#Updated translation: Swedish by maxzomborszki
+#Updated translation: Thai by adzpire
+#Updated translation: Turkish by kayazeren
+#Updated translation: Welsh by c_schmitz
Changes from 2.05+ (build 140317) to 2.05+ (build 140320) Mar 20, 2014
-Fixed issue #8807: When the AuditLog plugin is active, you can't add a Participant in the central participant database (Menno Dekker)
diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot
index 0592c648827..c536d03989c 100644
--- a/locale/_template/limesurvey.pot
+++ b/locale/_template/limesurvey.pot
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LimeSurvey language file\n"
"Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n"
-"POT-Creation-Date: 2014-03-30 23:05:59+00:00\n"
+"POT-Creation-Date: 2014-04-14 13:22:16+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -148,9 +148,9 @@ msgstr ""
#: application/controllers/admin/tokens.php:1590
#: application/controllers/admin/tokens.php:1627
#: application/controllers/admin/tokens.php:1896
-#: application/controllers/admin/tokens.php:2154
-#: application/controllers/admin/tokens.php:2211
-#: application/controllers/admin/tokens.php:2267
+#: application/controllers/admin/tokens.php:2158
+#: application/controllers/admin/tokens.php:2215
+#: application/controllers/admin/tokens.php:2271
#: application/controllers/admin/useraction.php:82
#: application/controllers/admin/useraction.php:177
#: application/controllers/admin/useraction.php:241
@@ -364,7 +364,7 @@ msgstr ""
#: application/controllers/admin/printablesurvey.php:1061
#: application/controllers/admin/quotas.php:515
#: application/controllers/admin/surveyadmin.php:656
-#: application/controllers/admin/tokens.php:2172
+#: application/controllers/admin/tokens.php:2176
#: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:204
#: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:215
#: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:237
@@ -477,7 +477,7 @@ msgstr ""
#: application/controllers/admin/conditionsaction.php:149
#: application/controllers/admin/tokens.php:1158
-#: application/controllers/admin/tokens.php:2238
+#: application/controllers/admin/tokens.php:2242
#: application/views/admin/assessments_view.php:131
#: application/views/admin/conditions/includes/conditions_scenario.php:13
#: application/views/admin/dataentry/import.php:16
@@ -603,7 +603,7 @@ msgstr ""
#: application/controllers/admin/printablesurvey.php:1063
#: application/controllers/admin/quotas.php:516
#: application/controllers/admin/surveyadmin.php:660
-#: application/controllers/admin/tokens.php:2174
+#: application/controllers/admin/tokens.php:2178
#: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:241
#: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:252
#: application/core/Survey_Common_Action.php:831
@@ -1083,7 +1083,7 @@ msgstr ""
#: application/controllers/admin/conditionsaction.php:1858
#: application/controllers/admin/translate.php:538
-#: application/extensions/Menu/MenuWidget.php:382
+#: application/extensions/Menu/MenuWidget.php:385
#: application/views/admin/conditions/conditionshead_view.php:21
#: application/views/admin/quotas/viewquotasrow_view.php:48
#: application/views/admin/survey/copySurvey_view.php:23
@@ -1329,7 +1329,7 @@ msgstr ""
#: application/controllers/admin/dataentry.php:207
#: application/controllers/admin/labels.php:100
#: application/controllers/admin/labels.php:133
-#: application/controllers/admin/participantsaction.php:1085
+#: application/controllers/admin/participantsaction.php:1086
#: application/controllers/admin/questiongroups.php:53
#: application/controllers/admin/questions.php:52
#: application/controllers/admin/surveyadmin.php:255
@@ -1446,8 +1446,8 @@ msgstr ""
#: application/helpers/common_helper.php:1156
#: application/helpers/common_helper.php:1226
#: application/helpers/common_helper.php:3937
-#: application/helpers/common_helper.php:7585
-#: application/helpers/common_helper.php:7625
+#: application/helpers/common_helper.php:7587
+#: application/helpers/common_helper.php:7627
#: application/views/admin/dataentry/content_view.php:156
#: application/views/admin/token/bounce.php:14
#: application/views/admin/token/bounce.php:56
@@ -1686,7 +1686,7 @@ msgstr ""
#: application/controllers/admin/responses.php:341
#: application/controllers/admin/responses.php:366
#: application/controllers/admin/responses.php:607
-#: application/helpers/common_helper.php:6403
+#: application/helpers/common_helper.php:6405
msgid "Access denied!"
msgstr ""
@@ -1913,7 +1913,7 @@ msgstr ""
msgid "%s participant(s) are to be copied "
msgstr ""
-#: application/controllers/admin/participantsaction.php:1058
+#: application/controllers/admin/participantsaction.php:1059
#: application/controllers/admin/surveyadmin.php:1329
#: application/views/admin/labels/labelview_view.php:141
#: application/views/admin/labels/labelview_view.php:150
@@ -1926,11 +1926,11 @@ msgstr ""
msgid "Please select a file to import!"
msgstr ""
-#: application/controllers/admin/participantsaction.php:1073
+#: application/controllers/admin/participantsaction.php:1074
msgid "This is not a .csv file."
msgstr ""
-#: application/controllers/admin/participantsaction.php:1130
+#: application/controllers/admin/participantsaction.php:1131
#: application/controllers/admin/templates.php:128
#: application/core/Survey_Common_Action.php:984
#: application/views/admin/participants/displayParticipants_view.php:143
@@ -1940,54 +1940,54 @@ msgstr ""
msgid "OK"
msgstr ""
-#: application/controllers/admin/participantsaction.php:1131
+#: application/controllers/admin/participantsaction.php:1132
#: application/views/admin/token/browse.php:99
msgid "Summary"
msgstr ""
-#: application/controllers/admin/participantsaction.php:1132
+#: application/controllers/admin/participantsaction.php:1133
msgid "Upload summary"
msgstr ""
-#: application/controllers/admin/participantsaction.php:1133
+#: application/controllers/admin/participantsaction.php:1134
msgid "You have to pair this field with an existing attribute."
msgstr ""
-#: application/controllers/admin/participantsaction.php:1134
+#: application/controllers/admin/participantsaction.php:1135
msgid "Only one CSV attribute is mapped with central attribute."
msgstr ""
-#: application/controllers/admin/participantsaction.php:1135
+#: application/controllers/admin/participantsaction.php:1136
#: application/views/admin/participants/attributeMapToken_view.php:9
#: application/views/admin/participants/attributeMap_view.php:17
msgid "This list cannot accept token attributes."
msgstr ""
-#: application/controllers/admin/participantsaction.php:1485
+#: application/controllers/admin/participantsaction.php:1486
msgid "%s participants have been shared"
msgstr ""
-#: application/controllers/admin/participantsaction.php:1505
+#: application/controllers/admin/participantsaction.php:1506
msgid "%s participants have been copied to the central participants table"
msgstr ""
-#: application/controllers/admin/participantsaction.php:1508
-#: application/controllers/admin/participantsaction.php:1532
-#: application/controllers/admin/participantsaction.php:1562
+#: application/controllers/admin/participantsaction.php:1509
+#: application/controllers/admin/participantsaction.php:1533
+#: application/controllers/admin/participantsaction.php:1563
msgid "%s entries were not copied because they already existed"
msgstr ""
-#: application/controllers/admin/participantsaction.php:1512
+#: application/controllers/admin/participantsaction.php:1513
msgid "Attribute values for existing participants have been updated from the token records"
msgstr ""
-#: application/controllers/admin/participantsaction.php:1529
-#: application/controllers/admin/participantsaction.php:1559
+#: application/controllers/admin/participantsaction.php:1530
+#: application/controllers/admin/participantsaction.php:1560
msgid "%s participants have been copied to the survey token table"
msgstr ""
-#: application/controllers/admin/participantsaction.php:1536
-#: application/controllers/admin/participantsaction.php:1566
+#: application/controllers/admin/participantsaction.php:1537
+#: application/controllers/admin/participantsaction.php:1567
msgid "Attribute values for existing participants have been updated from the participants records"
msgstr ""
@@ -2468,7 +2468,7 @@ msgid "Database error!!"
msgstr ""
#: application/controllers/admin/surveyadmin.php:468
-#: application/controllers/admin/tokens.php:2254
+#: application/controllers/admin/tokens.php:2258
#: application/controllers/AdminController.php:86
#: application/helpers/admin/import_helper.php:2612
#: application/views/admin/authentication/forgotpassword.php:15
@@ -2632,7 +2632,7 @@ msgid "Survey was successfully added."
msgstr ""
#: application/controllers/admin/surveypermission.php:41
-#: application/extensions/Menu/MenuWidget.php:258
+#: application/extensions/Menu/MenuWidget.php:261
#: application/views/admin/survey/surveybar_view.php:66
msgid "Survey permissions"
msgstr ""
@@ -2750,32 +2750,32 @@ msgstr ""
#: application/controllers/admin/surveypermission.php:346
#: application/controllers/admin/surveypermission.php:535
#: application/controllers/admin/surveypermission.php:638
-#: application/controllers/admin/tokens.php:2394
-#: application/controllers/admin/tokens.php:2438
+#: application/controllers/admin/tokens.php:2398
+#: application/controllers/admin/tokens.php:2442
#: application/controllers/admin/useraction.php:742
-#: application/helpers/common_helper.php:6409
-#: application/helpers/common_helper.php:6414
-#: application/helpers/common_helper.php:6419
-#: application/helpers/common_helper.php:6424
-#: application/helpers/common_helper.php:6429
-#: application/helpers/common_helper.php:6434
-#: application/helpers/common_helper.php:6439
-#: application/helpers/common_helper.php:6444
-#: application/helpers/common_helper.php:6449
-#: application/helpers/common_helper.php:6455
-#: application/helpers/common_helper.php:6461
-#: application/helpers/common_helper.php:6466
-#: application/helpers/common_helper.php:6471
-#: application/helpers/common_helper.php:6476
-#: application/helpers/common_helper.php:6481
-#: application/helpers/common_helper.php:6486
-#: application/helpers/common_helper.php:6492
-#: application/helpers/common_helper.php:6497
-#: application/helpers/common_helper.php:6506
-#: application/helpers/common_helper.php:6511
-#: application/helpers/common_helper.php:6518
-#: application/helpers/common_helper.php:6522
-#: application/helpers/common_helper.php:6526
+#: application/helpers/common_helper.php:6411
+#: application/helpers/common_helper.php:6416
+#: application/helpers/common_helper.php:6421
+#: application/helpers/common_helper.php:6426
+#: application/helpers/common_helper.php:6431
+#: application/helpers/common_helper.php:6436
+#: application/helpers/common_helper.php:6441
+#: application/helpers/common_helper.php:6446
+#: application/helpers/common_helper.php:6451
+#: application/helpers/common_helper.php:6457
+#: application/helpers/common_helper.php:6463
+#: application/helpers/common_helper.php:6468
+#: application/helpers/common_helper.php:6473
+#: application/helpers/common_helper.php:6478
+#: application/helpers/common_helper.php:6483
+#: application/helpers/common_helper.php:6488
+#: application/helpers/common_helper.php:6494
+#: application/helpers/common_helper.php:6499
+#: application/helpers/common_helper.php:6508
+#: application/helpers/common_helper.php:6513
+#: application/helpers/common_helper.php:6520
+#: application/helpers/common_helper.php:6524
+#: application/helpers/common_helper.php:6528
#: application/helpers/frontend_helper.php:912
#: application/helpers/frontend_helper.php:992
#: application/helpers/frontend_helper.php:1156
@@ -3325,94 +3325,94 @@ msgstr ""
msgid "Can't connect to the LDAP directory"
msgstr ""
-#: application/controllers/admin/tokens.php:2169
-#: application/controllers/admin/tokens.php:2196
+#: application/controllers/admin/tokens.php:2173
+#: application/controllers/admin/tokens.php:2200
msgid "Create tokens"
msgstr ""
-#: application/controllers/admin/tokens.php:2170
+#: application/controllers/admin/tokens.php:2174
msgid "Clicking 'Yes' will generate tokens for all those in this token list that have not been issued one. Continue?"
msgstr ""
-#: application/controllers/admin/tokens.php:2187
+#: application/controllers/admin/tokens.php:2191
msgid "Only %s token has been created."
msgid_plural "Only %s tokens have been created."
msgstr[0] ""
msgstr[1] ""
-#: application/controllers/admin/tokens.php:2188
+#: application/controllers/admin/tokens.php:2192
msgid "Need %s token."
msgid_plural "Need %s tokens."
msgstr[0] ""
msgstr[1] ""
-#: application/controllers/admin/tokens.php:2193
+#: application/controllers/admin/tokens.php:2197
msgid "%s token has been created."
msgid_plural "%s tokens have been created."
msgstr[0] ""
msgstr[1] ""
-#: application/controllers/admin/tokens.php:2232
-#: application/controllers/admin/tokens.php:2250
+#: application/controllers/admin/tokens.php:2236
+#: application/controllers/admin/tokens.php:2254
msgid "Delete Tokens Table"
msgstr ""
-#: application/controllers/admin/tokens.php:2233
+#: application/controllers/admin/tokens.php:2237
msgid "If you delete this table tokens will no longer be required to access this survey."
msgstr ""
-#: application/controllers/admin/tokens.php:2233
+#: application/controllers/admin/tokens.php:2237
msgid "A backup of this table will be made if you proceed. Your system administrator will be able to access this table."
msgstr ""
-#: application/controllers/admin/tokens.php:2236
+#: application/controllers/admin/tokens.php:2240
msgid "Delete Tokens"
msgstr ""
-#: application/controllers/admin/tokens.php:2251
+#: application/controllers/admin/tokens.php:2255
msgid "The tokens table has now been removed and tokens are no longer required to access this survey."
msgstr ""
-#: application/controllers/admin/tokens.php:2251
+#: application/controllers/admin/tokens.php:2255
msgid "A backup of this table has been made and can be accessed by your system administrator."
msgstr ""
-#: application/controllers/admin/tokens.php:2301
+#: application/controllers/admin/tokens.php:2305
#: application/views/admin/globalSettings_view.php:14
#: application/views/admin/token/bounce.php:1
#: application/views/admin/token/tokenbar.php:65
msgid "Bounce settings"
msgstr ""
-#: application/controllers/admin/tokens.php:2302
+#: application/controllers/admin/tokens.php:2306
msgid "Bounce settings have been saved."
msgstr ""
-#: application/controllers/admin/tokens.php:2375
+#: application/controllers/admin/tokens.php:2379
#: application/views/admin/token/tokenwarning.php:6
msgid "Tokens have not been initialised for this survey."
msgstr ""
-#: application/controllers/admin/tokens.php:2381
+#: application/controllers/admin/tokens.php:2385
msgid "Tokens already exist for this survey."
msgstr ""
-#: application/controllers/admin/tokens.php:2391
+#: application/controllers/admin/tokens.php:2395
#: application/views/admin/export/exportresults_view.php:128
#: application/views/admin/token/tokenbar.php:5
#: application/views/admin/token/tokenwarning.php:3
msgid "Token control"
msgstr ""
-#: application/controllers/admin/tokens.php:2392
+#: application/controllers/admin/tokens.php:2396
msgid "A token table has been created for this survey."
msgstr ""
-#: application/controllers/admin/tokens.php:2435
+#: application/controllers/admin/tokens.php:2439
msgid "Import old tokens"
msgstr ""
-#: application/controllers/admin/tokens.php:2436
+#: application/controllers/admin/tokens.php:2440
msgid "A token table has been created for this survey and the old tokens were imported."
msgstr ""
@@ -3436,7 +3436,7 @@ msgstr ""
#: application/controllers/admin/translate.php:305
#: application/core/Survey_Common_Action.php:564
-#: application/extensions/Menu/MenuWidget.php:233
+#: application/extensions/Menu/MenuWidget.php:236
msgid "Test this survey"
msgstr ""
@@ -3454,15 +3454,15 @@ msgid "Translate to"
msgstr ""
#: application/controllers/admin/translate.php:395
-#: application/extensions/Menu/MenuWidget.php:490
+#: application/extensions/Menu/MenuWidget.php:493
#: application/helpers/common_helper.php:431
#: application/helpers/common_helper.php:547
#: application/helpers/common_helper.php:1155
#: application/helpers/common_helper.php:1225
-#: application/helpers/common_helper.php:7159
-#: application/helpers/common_helper.php:7196
-#: application/helpers/common_helper.php:7584
-#: application/helpers/common_helper.php:7624
+#: application/helpers/common_helper.php:7161
+#: application/helpers/common_helper.php:7198
+#: application/helpers/common_helper.php:7586
+#: application/helpers/common_helper.php:7626
#: application/helpers/qanda_helper.php:1381
#: application/helpers/qanda_helper.php:1561
#: application/helpers/qanda_helper.php:2150
@@ -3575,24 +3575,24 @@ msgstr ""
msgid "Question code / ID"
msgstr ""
-#: application/controllers/admin/update.php:263
+#: application/controllers/admin/update.php:267
msgid "Error on file backup: %s"
msgstr ""
-#: application/controllers/admin/update.php:266
+#: application/controllers/admin/update.php:270
msgid "File backup created: %s"
msgstr ""
-#: application/controllers/admin/update.php:288
-#: application/controllers/admin/update.php:297
+#: application/controllers/admin/update.php:292
+#: application/controllers/admin/update.php:301
msgid "Unable to backup your database for unknow reason. Before proceeding please backup your database using a backup tool!"
msgstr ""
-#: application/controllers/admin/update.php:292
+#: application/controllers/admin/update.php:296
msgid "DB backup created: %s"
msgstr ""
-#: application/controllers/admin/update.php:303
+#: application/controllers/admin/update.php:307
msgid "Database backup functionality is currently not available for your database type. Before proceeding please backup your database using a backup tool!"
msgstr ""
@@ -3809,10 +3809,10 @@ msgstr ""
#: application/controllers/AdminController.php:94
#: application/core/Survey_Common_Action.php:346
-#: application/extensions/Menu/MenuWidget.php:139
+#: application/extensions/Menu/MenuWidget.php:142
#: application/views/admin/conditions/conditionshead_view.php:25
#: application/views/admin/index.php:4
-#: application/views/admin/super/adminmenu.php:118
+#: application/views/admin/super/adminmenu.php:122
#: plugins/Demo/Example/Example.php:53
msgid "LimeSurvey online manual"
msgstr ""
@@ -4447,61 +4447,61 @@ msgstr ""
msgid "Default administration page"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:60
-#: application/views/admin/super/adminmenu.php:29
+#: application/extensions/Menu/MenuWidget.php:62
+#: application/views/admin/super/adminmenu.php:32
msgid "Manage survey administrators"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:84
+#: application/extensions/Menu/MenuWidget.php:87
#: application/helpers/common_helper.php:426
#: application/views/admin/survey/listSurveys_view.php:68
#: application/views/plugins/index.php:13
msgid "Inactive"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:88
+#: application/extensions/Menu/MenuWidget.php:91
#: application/helpers/common_helper.php:421
#: application/views/admin/survey/listSurveys_view.php:67
msgid "Expired"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:112
-#: application/views/admin/super/adminmenu.php:96
+#: application/extensions/Menu/MenuWidget.php:115
+#: application/views/admin/super/adminmenu.php:100
msgid "Surveys:"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:117
+#: application/extensions/Menu/MenuWidget.php:120
msgid "No surveys available."
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:123
-#: application/views/admin/super/adminmenu.php:101
+#: application/extensions/Menu/MenuWidget.php:126
+#: application/views/admin/super/adminmenu.php:105
msgid "Detailed list of surveys"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:133
+#: application/extensions/Menu/MenuWidget.php:136
#: application/views/admin/labels/labelsetsbar_view.php:41
-#: application/views/admin/super/adminmenu.php:115
+#: application/views/admin/super/adminmenu.php:119
#: application/views/admin/templates/templateeditorbar_view.php:127
msgid "Logout"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:161
+#: application/extensions/Menu/MenuWidget.php:164
#: application/views/admin/survey/Question/questionbar_view.php:14
msgid "Preview this question"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:246
+#: application/extensions/Menu/MenuWidget.php:249
#: application/views/admin/survey/surveybar_view.php:58
msgid "Edit text elements"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:252
+#: application/extensions/Menu/MenuWidget.php:255
#: application/views/admin/survey/surveybar_view.php:62
msgid "General settings"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:264
+#: application/extensions/Menu/MenuWidget.php:267
#: application/models/Permission.php:64
#: application/views/admin/survey/copySurvey_view.php:47
#: application/views/admin/survey/importSurvey_view.php:61
@@ -4509,7 +4509,7 @@ msgstr ""
msgid "Quotas"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:270
+#: application/extensions/Menu/MenuWidget.php:273
#: application/models/Permission.php:63
#: application/views/admin/survey/copySurvey_view.php:46
#: application/views/admin/survey/importSurvey_view.php:60
@@ -4517,122 +4517,122 @@ msgstr ""
msgid "Assessments"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:276
+#: application/extensions/Menu/MenuWidget.php:279
#: application/views/admin/survey/surveybar_view.php:79
msgid "Email templates"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:282
+#: application/extensions/Menu/MenuWidget.php:285
#: application/views/admin/survey/surveybar_view.php:84
#: application/views/admin/survey/surveybar_view.php:87
msgid "Survey logic file"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:296
+#: application/extensions/Menu/MenuWidget.php:299
#: application/views/admin/survey/deleteSurvey_view.php:3
#: application/views/admin/survey/deleteSurvey_view.php:35
#: application/views/admin/survey/surveybar_view.php:105
msgid "Delete survey"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:302
+#: application/extensions/Menu/MenuWidget.php:305
#: application/views/admin/survey/surveybar_view.php:110
#: application/views/admin/survey/surveybar_view.php:113
msgid "Quick-translation"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:308
+#: application/extensions/Menu/MenuWidget.php:311
msgid "Expression manager"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:314
+#: application/extensions/Menu/MenuWidget.php:317
#: application/views/admin/survey/surveybar_view.php:124
#: application/views/admin/survey/surveybar_view.php:127
msgid "Reset conditions"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:319
+#: application/extensions/Menu/MenuWidget.php:322
#: application/views/admin/survey/surveybar_view.php:131
msgid "Regenerate question codes"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:323
+#: application/extensions/Menu/MenuWidget.php:326
#: application/views/admin/survey/surveybar_view.php:135
msgid "Straight"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:328
+#: application/extensions/Menu/MenuWidget.php:331
msgid "By group"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:345
+#: application/extensions/Menu/MenuWidget.php:348
#: application/views/admin/survey/surveybar_view.php:320
msgid "Add new group to survey"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:363
+#: application/extensions/Menu/MenuWidget.php:366
msgid "Preview this group"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:371
+#: application/extensions/Menu/MenuWidget.php:374
#: application/views/admin/survey/QuestionGroups/questiongroupbar_view.php:32
msgid "Edit current question group"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:389
+#: application/extensions/Menu/MenuWidget.php:392
#: application/views/admin/survey/QuestionGroups/questiongroupbar_view.php:118
msgid "Add new question to group"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:536
+#: application/extensions/Menu/MenuWidget.php:539
#: application/views/admin/globalSettings_view.php:8
-#: application/views/admin/super/adminmenu.php:40
+#: application/views/admin/super/adminmenu.php:44
msgid "Global settings"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:548
-#: application/views/admin/super/adminmenu.php:46
+#: application/extensions/Menu/MenuWidget.php:551
+#: application/views/admin/super/adminmenu.php:50
msgid "Check Data Integrity"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:561
-#: application/views/admin/super/adminmenu.php:109
+#: application/extensions/Menu/MenuWidget.php:564
+#: application/views/admin/super/adminmenu.php:113
msgid "Create, import, or copy a survey"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:574
-#: application/views/admin/super/adminmenu.php:58
+#: application/extensions/Menu/MenuWidget.php:577
+#: application/views/admin/super/adminmenu.php:62
msgid "Backup Entire Database"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:581
-#: application/views/admin/super/adminmenu.php:62
+#: application/extensions/Menu/MenuWidget.php:584
+#: application/views/admin/super/adminmenu.php:66
msgid "The database export is only available for MySQL databases. For other database types please use the according backup mechanism to create a database dump."
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:595
-#: application/views/admin/super/adminmenu.php:74
+#: application/extensions/Menu/MenuWidget.php:598
+#: application/views/admin/super/adminmenu.php:78
msgid "Edit label sets"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:606
-#: application/views/admin/super/adminmenu.php:80
+#: application/extensions/Menu/MenuWidget.php:609
+#: application/views/admin/super/adminmenu.php:84
msgid "Template Editor"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:618
-#: application/views/admin/super/adminmenu.php:34
+#: application/extensions/Menu/MenuWidget.php:621
+#: application/views/admin/super/adminmenu.php:38
msgid "Create/edit user groups"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:629
-#: application/views/admin/super/adminmenu.php:87
+#: application/extensions/Menu/MenuWidget.php:632
+#: application/views/admin/super/adminmenu.php:91
#: application/views/admin/token/tokenbar.php:71
msgid "Central participant database/panel"
msgstr ""
-#: application/extensions/Menu/MenuWidget.php:642
-#: application/views/admin/super/adminmenu.php:92
+#: application/extensions/Menu/MenuWidget.php:645
+#: application/views/admin/super/adminmenu.php:96
msgid "Plugin manager"
msgstr ""
@@ -6771,250 +6771,250 @@ msgstr ""
msgid "Uses left"
msgstr ""
-#: application/helpers/common_helper.php:5651
+#: application/helpers/common_helper.php:5653
msgid "Error when checking for new version: %s"
msgstr ""
-#: application/helpers/common_helper.php:6408
+#: application/helpers/common_helper.php:6410
msgid "You are not allowed dump the database!"
msgstr ""
-#: application/helpers/common_helper.php:6413
+#: application/helpers/common_helper.php:6415
msgid "You are not allowed export a label set!"
msgstr ""
-#: application/helpers/common_helper.php:6418
+#: application/helpers/common_helper.php:6420
msgid "You are not allowed to change user data!"
msgstr ""
-#: application/helpers/common_helper.php:6423
+#: application/helpers/common_helper.php:6425
msgid "You are not allowed to create new surveys!"
msgstr ""
-#: application/helpers/common_helper.php:6428
+#: application/helpers/common_helper.php:6430
msgid "You are not allowed to delete this survey!"
msgstr ""
-#: application/helpers/common_helper.php:6433
+#: application/helpers/common_helper.php:6435
msgid "You are not allowed to add new questions for this survey!"
msgstr ""
-#: application/helpers/common_helper.php:6438
+#: application/helpers/common_helper.php:6440
msgid "You are not allowed to activate this survey!"
msgstr ""
-#: application/helpers/common_helper.php:6443
+#: application/helpers/common_helper.php:6445
msgid "You are not allowed to stop this survey!"
msgstr ""
-#: application/helpers/common_helper.php:6448
+#: application/helpers/common_helper.php:6450
msgid "You are not allowed to add a group to this survey!"
msgstr ""
-#: application/helpers/common_helper.php:6454
+#: application/helpers/common_helper.php:6456
msgid "You are not allowed to order groups in this survey!"
msgstr ""
-#: application/helpers/common_helper.php:6460
+#: application/helpers/common_helper.php:6462
msgid "You are not allowed to edit this survey!"
msgstr ""
-#: application/helpers/common_helper.php:6465
+#: application/helpers/common_helper.php:6467
msgid "You are not allowed to edit groups in this survey!"
msgstr ""
-#: application/helpers/common_helper.php:6470
+#: application/helpers/common_helper.php:6472
msgid "You are not allowed to browse responses!"
msgstr ""
-#: application/helpers/common_helper.php:6475
+#: application/helpers/common_helper.php:6477
msgid "You are not allowed to set assessment rules!"
msgstr ""
-#: application/helpers/common_helper.php:6480
+#: application/helpers/common_helper.php:6482
msgid "You are not allowed to delete this group!"
msgstr ""
-#: application/helpers/common_helper.php:6485
+#: application/helpers/common_helper.php:6487
msgid "You are not allowed to import a survey!"
msgstr ""
-#: application/helpers/common_helper.php:6491
+#: application/helpers/common_helper.php:6493
msgid "You are not allowed to import a group!"
msgstr ""
-#: application/helpers/common_helper.php:6496
+#: application/helpers/common_helper.php:6498
msgid "You are not allowed to to import a question!"
msgstr ""
-#: application/helpers/common_helper.php:6505
-#: application/helpers/common_helper.php:6510
+#: application/helpers/common_helper.php:6507
+#: application/helpers/common_helper.php:6512
msgid "Security alert"
msgstr ""
-#: application/helpers/common_helper.php:6505
-#: application/helpers/common_helper.php:6510
+#: application/helpers/common_helper.php:6507
+#: application/helpers/common_helper.php:6512
msgid "Someone may be trying to use your LimeSurvey session (CSRF attack suspected). If you just clicked on a malicious link, please report this to your system administrator."
msgstr ""
-#: application/helpers/common_helper.php:6505
-#: application/helpers/common_helper.php:6510
+#: application/helpers/common_helper.php:6507
+#: application/helpers/common_helper.php:6512
msgid "Also this problem can occur when you are working/editing in LimeSurvey in several browser windows/tabs at the same time."
msgstr ""
-#: application/helpers/common_helper.php:6515
+#: application/helpers/common_helper.php:6517
msgid "You are not allowed to perform this operation!"
msgstr ""
-#: application/helpers/common_helper.php:7269
+#: application/helpers/common_helper.php:7271
msgid "SQL command failed: %s"
msgstr ""
-#: application/helpers/common_helper.php:7695
+#: application/helpers/common_helper.php:7697
msgid "ARMSCII-8 Armenian"
msgstr ""
-#: application/helpers/common_helper.php:7696
+#: application/helpers/common_helper.php:7698
msgid "US ASCII"
msgstr ""
-#: application/helpers/common_helper.php:7697
+#: application/helpers/common_helper.php:7699
msgid "Automatic"
msgstr ""
-#: application/helpers/common_helper.php:7698
+#: application/helpers/common_helper.php:7700
msgid "Big5 Traditional Chinese"
msgstr ""
-#: application/helpers/common_helper.php:7699
+#: application/helpers/common_helper.php:7701
msgid "Binary pseudo charset"
msgstr ""
-#: application/helpers/common_helper.php:7700
+#: application/helpers/common_helper.php:7702
msgid "Windows Central European (Windows-1250)"
msgstr ""
-#: application/helpers/common_helper.php:7701
+#: application/helpers/common_helper.php:7703
msgid "Windows Cyrillic (Windows-1251)"
msgstr ""
-#: application/helpers/common_helper.php:7702
+#: application/helpers/common_helper.php:7704
msgid "Windows Arabic (Windows-1256)"
msgstr ""
-#: application/helpers/common_helper.php:7703
+#: application/helpers/common_helper.php:7705
msgid "Windows Baltic (Windows-1257)"
msgstr ""
-#: application/helpers/common_helper.php:7704
+#: application/helpers/common_helper.php:7706
msgid "DOS West European (cp850)"
msgstr ""
-#: application/helpers/common_helper.php:7705
+#: application/helpers/common_helper.php:7707
msgid "DOS Central European (cp852)"
msgstr ""
-#: application/helpers/common_helper.php:7706
+#: application/helpers/common_helper.php:7708
msgid "DOS Cyrillic (cp866)"
msgstr ""
-#: application/helpers/common_helper.php:7707
+#: application/helpers/common_helper.php:7709
msgid "Windows-31J - SJIS for Windows Japanese (cp932)"
msgstr ""
-#: application/helpers/common_helper.php:7708
+#: application/helpers/common_helper.php:7710
msgid "DEC West European"
msgstr ""
-#: application/helpers/common_helper.php:7709
+#: application/helpers/common_helper.php:7711
msgid "UJIS for Windows Japanese"
msgstr ""
-#: application/helpers/common_helper.php:7710
+#: application/helpers/common_helper.php:7712
msgid "EUC-KR Korean"
msgstr ""
-#: application/helpers/common_helper.php:7711
+#: application/helpers/common_helper.php:7713
msgid "GB2312 Simplified Chinese"
msgstr ""
-#: application/helpers/common_helper.php:7712
+#: application/helpers/common_helper.php:7714
msgid "GBK Simplified Chinese"
msgstr ""
-#: application/helpers/common_helper.php:7713
+#: application/helpers/common_helper.php:7715
msgid "GEOSTD8 Georgian"
msgstr ""
-#: application/helpers/common_helper.php:7714
+#: application/helpers/common_helper.php:7716
msgid "ISO 8859-7 Greek"
msgstr ""
-#: application/helpers/common_helper.php:7715
+#: application/helpers/common_helper.php:7717
msgid "ISO 8859-8 Hebrew"
msgstr ""
-#: application/helpers/common_helper.php:7716
+#: application/helpers/common_helper.php:7718
msgid "HP West European"
msgstr ""
-#: application/helpers/common_helper.php:7717
+#: application/helpers/common_helper.php:7719
msgid "DOS Kamenicky Czech-Slovak (cp895)"
msgstr ""
-#: application/helpers/common_helper.php:7718
+#: application/helpers/common_helper.php:7720
msgid "KOI8-R Relcom Russian"
msgstr ""
-#: application/helpers/common_helper.php:7719
+#: application/helpers/common_helper.php:7721
msgid "KOI8-U Ukrainian"
msgstr ""
-#: application/helpers/common_helper.php:7720
+#: application/helpers/common_helper.php:7722
msgid "ISO 8859-1 West European (latin1)"
msgstr ""
-#: application/helpers/common_helper.php:7721
+#: application/helpers/common_helper.php:7723
msgid "ISO 8859-2 Central European (latin2)"
msgstr ""
-#: application/helpers/common_helper.php:7722
+#: application/helpers/common_helper.php:7724
msgid "ISO 8859-9 Turkish (latin5)"
msgstr ""
-#: application/helpers/common_helper.php:7723
+#: application/helpers/common_helper.php:7725
msgid "ISO 8859-13 Baltic (latin7)"
msgstr ""
-#: application/helpers/common_helper.php:7724
+#: application/helpers/common_helper.php:7726
msgid "Mac Central European"
msgstr ""
-#: application/helpers/common_helper.php:7725
+#: application/helpers/common_helper.php:7727
msgid "Mac West European"
msgstr ""
-#: application/helpers/common_helper.php:7726
+#: application/helpers/common_helper.php:7728
msgid "Shift-JIS Japanese"
msgstr ""
-#: application/helpers/common_helper.php:7727
+#: application/helpers/common_helper.php:7729
msgid "7bit Swedish"
msgstr ""
-#: application/helpers/common_helper.php:7728
+#: application/helpers/common_helper.php:7730
msgid "TIS620 Thai"
msgstr ""
-#: application/helpers/common_helper.php:7729
+#: application/helpers/common_helper.php:7731
msgid "UCS-2 Unicode"
msgstr ""
-#: application/helpers/common_helper.php:7730
+#: application/helpers/common_helper.php:7732
msgid "EUC-JP Japanese"
msgstr ""
-#: application/helpers/common_helper.php:7731
+#: application/helpers/common_helper.php:7733
msgid "UTF-8 Unicode"
msgstr ""
diff --git a/locale/ca/LC_MESSAGES/ca.mo b/locale/ca/LC_MESSAGES/ca.mo
index e9f31087949..4c67367f87d 100644
Binary files a/locale/ca/LC_MESSAGES/ca.mo and b/locale/ca/LC_MESSAGES/ca.mo differ
diff --git a/locale/cs-informal/LC_MESSAGES/cs-informal.mo b/locale/cs-informal/LC_MESSAGES/cs-informal.mo
index 673d8fef9e6..e27dd30eefc 100644
Binary files a/locale/cs-informal/LC_MESSAGES/cs-informal.mo and b/locale/cs-informal/LC_MESSAGES/cs-informal.mo differ
diff --git a/locale/cs/LC_MESSAGES/cs.mo b/locale/cs/LC_MESSAGES/cs.mo
index add578c07bc..683df62ab9d 100644
Binary files a/locale/cs/LC_MESSAGES/cs.mo and b/locale/cs/LC_MESSAGES/cs.mo differ
diff --git a/locale/cy/LC_MESSAGES/cy.mo b/locale/cy/LC_MESSAGES/cy.mo
index ec2301bf289..41a9b6cf454 100644
Binary files a/locale/cy/LC_MESSAGES/cy.mo and b/locale/cy/LC_MESSAGES/cy.mo differ
diff --git a/locale/de-informal/LC_MESSAGES/de-informal.mo b/locale/de-informal/LC_MESSAGES/de-informal.mo
index 7ec237d9f9c..14339b4a01f 100644
Binary files a/locale/de-informal/LC_MESSAGES/de-informal.mo and b/locale/de-informal/LC_MESSAGES/de-informal.mo differ
diff --git a/locale/de/LC_MESSAGES/de.mo b/locale/de/LC_MESSAGES/de.mo
index 11131852863..6a5ee186724 100644
Binary files a/locale/de/LC_MESSAGES/de.mo and b/locale/de/LC_MESSAGES/de.mo differ
diff --git a/locale/el/LC_MESSAGES/el.mo b/locale/el/LC_MESSAGES/el.mo
index 57911784fb3..4df484d50ba 100644
Binary files a/locale/el/LC_MESSAGES/el.mo and b/locale/el/LC_MESSAGES/el.mo differ
diff --git a/locale/es/LC_MESSAGES/es.mo b/locale/es/LC_MESSAGES/es.mo
index 80699665f2d..06052d956dc 100644
Binary files a/locale/es/LC_MESSAGES/es.mo and b/locale/es/LC_MESSAGES/es.mo differ
diff --git a/locale/et/LC_MESSAGES/et.mo b/locale/et/LC_MESSAGES/et.mo
index b722b62f5c7..b2f789c24a2 100644
Binary files a/locale/et/LC_MESSAGES/et.mo and b/locale/et/LC_MESSAGES/et.mo differ
diff --git a/locale/eu/LC_MESSAGES/eu.mo b/locale/eu/LC_MESSAGES/eu.mo
index 6bfe9ecdbf4..af52b653ab3 100644
Binary files a/locale/eu/LC_MESSAGES/eu.mo and b/locale/eu/LC_MESSAGES/eu.mo differ
diff --git a/locale/fr/LC_MESSAGES/fr.mo b/locale/fr/LC_MESSAGES/fr.mo
index a0f0aa8823c..5e0a4223c24 100644
Binary files a/locale/fr/LC_MESSAGES/fr.mo and b/locale/fr/LC_MESSAGES/fr.mo differ
diff --git a/locale/hy/LC_MESSAGES/hy.mo b/locale/hy/LC_MESSAGES/hy.mo
index 028db736507..fedb1b96e06 100644
Binary files a/locale/hy/LC_MESSAGES/hy.mo and b/locale/hy/LC_MESSAGES/hy.mo differ
diff --git a/locale/it-informal/LC_MESSAGES/it-informal.mo b/locale/it-informal/LC_MESSAGES/it-informal.mo
index 4efbb073816..62a96e1e757 100644
Binary files a/locale/it-informal/LC_MESSAGES/it-informal.mo and b/locale/it-informal/LC_MESSAGES/it-informal.mo differ
diff --git a/locale/it/LC_MESSAGES/it.mo b/locale/it/LC_MESSAGES/it.mo
index 9c21263f275..9247f1ab436 100644
Binary files a/locale/it/LC_MESSAGES/it.mo and b/locale/it/LC_MESSAGES/it.mo differ
diff --git a/locale/ja/LC_MESSAGES/ja.mo b/locale/ja/LC_MESSAGES/ja.mo
index e88088e6627..2eea7daa490 100644
Binary files a/locale/ja/LC_MESSAGES/ja.mo and b/locale/ja/LC_MESSAGES/ja.mo differ
diff --git a/locale/ms/LC_MESSAGES/ms.mo b/locale/ms/LC_MESSAGES/ms.mo
index 628766857a6..579c991f5d5 100644
Binary files a/locale/ms/LC_MESSAGES/ms.mo and b/locale/ms/LC_MESSAGES/ms.mo differ
diff --git a/locale/nb/LC_MESSAGES/nb.mo b/locale/nb/LC_MESSAGES/nb.mo
index 4d424e372ea..2ee57140a5d 100644
Binary files a/locale/nb/LC_MESSAGES/nb.mo and b/locale/nb/LC_MESSAGES/nb.mo differ
diff --git a/locale/nl-informal/LC_MESSAGES/nl-informal.mo b/locale/nl-informal/LC_MESSAGES/nl-informal.mo
index d17092e15d4..4656e820356 100644
Binary files a/locale/nl-informal/LC_MESSAGES/nl-informal.mo and b/locale/nl-informal/LC_MESSAGES/nl-informal.mo differ
diff --git a/locale/nl/LC_MESSAGES/nl.mo b/locale/nl/LC_MESSAGES/nl.mo
index 4be3dc3c15a..dcf708f2682 100644
Binary files a/locale/nl/LC_MESSAGES/nl.mo and b/locale/nl/LC_MESSAGES/nl.mo differ
diff --git a/locale/nn/LC_MESSAGES/nn.mo b/locale/nn/LC_MESSAGES/nn.mo
index 8d8537067a6..7997b588175 100644
Binary files a/locale/nn/LC_MESSAGES/nn.mo and b/locale/nn/LC_MESSAGES/nn.mo differ
diff --git a/locale/pap-AW/LC_MESSAGES/pap-AW.mo b/locale/pap-AW/LC_MESSAGES/pap-AW.mo
index e69de29bb2d..70aff20b58b 100644
Binary files a/locale/pap-AW/LC_MESSAGES/pap-AW.mo and b/locale/pap-AW/LC_MESSAGES/pap-AW.mo differ
diff --git a/locale/pap-CW/LC_MESSAGES/pap-CW.mo b/locale/pap-CW/LC_MESSAGES/pap-CW.mo
index e69de29bb2d..066e4dc8a3e 100644
Binary files a/locale/pap-CW/LC_MESSAGES/pap-CW.mo and b/locale/pap-CW/LC_MESSAGES/pap-CW.mo differ
diff --git a/locale/pl/LC_MESSAGES/pl.mo b/locale/pl/LC_MESSAGES/pl.mo
index 3dd1b7cb8a9..0e0ef4d2a3c 100644
Binary files a/locale/pl/LC_MESSAGES/pl.mo and b/locale/pl/LC_MESSAGES/pl.mo differ
diff --git a/locale/ru/LC_MESSAGES/ru.mo b/locale/ru/LC_MESSAGES/ru.mo
index dabf9ced86b..5c68d8d857a 100644
Binary files a/locale/ru/LC_MESSAGES/ru.mo and b/locale/ru/LC_MESSAGES/ru.mo differ
diff --git a/locale/sv/LC_MESSAGES/sv.mo b/locale/sv/LC_MESSAGES/sv.mo
index 9d0db1d3277..037ab99ca67 100644
Binary files a/locale/sv/LC_MESSAGES/sv.mo and b/locale/sv/LC_MESSAGES/sv.mo differ
diff --git a/locale/tr/LC_MESSAGES/tr.mo b/locale/tr/LC_MESSAGES/tr.mo
index 97e748d153d..261ffc59f18 100644
Binary files a/locale/tr/LC_MESSAGES/tr.mo and b/locale/tr/LC_MESSAGES/tr.mo differ
diff --git a/locale/uk/LC_MESSAGES/uk.mo b/locale/uk/LC_MESSAGES/uk.mo
index 455ce2bdba9..a30fd3b6e20 100644
Binary files a/locale/uk/LC_MESSAGES/uk.mo and b/locale/uk/LC_MESSAGES/uk.mo differ
diff --git a/locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo b/locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo
index cd3b9e2b2f4..64c88468df0 100644
Binary files a/locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo and b/locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo differ
diff --git a/scripts/admin/listsurvey.js b/scripts/admin/listsurvey.js
index 662ba5e3d1d..e0c29a509f1 100644
--- a/scripts/admin/listsurvey.js
+++ b/scripts/admin/listsurvey.js
@@ -85,7 +85,6 @@ $(document).ready(function(){
$('#searchbutton').click(function(){
});
- var lastSel,lastSel2;
function returnColModel() {
if($.cookie("detailedsurveycolumns")) {
hidden=$.cookie("detailedsurveycolumns").split('|');
diff --git a/scripts/admin/participantdisplay.js b/scripts/admin/participantdisplay.js
index 2a0e05657bd..929846321cd 100644
--- a/scripts/admin/participantdisplay.js
+++ b/scripts/admin/participantdisplay.js
@@ -458,6 +458,7 @@ $(document).ready(function() {
height : 300,
open: function(event, ui) {
$('#attributes').multiselect({ includeSelectAllOption:true,
+ selectAllValue: '0',
selectAllText: sSelectAllText,
nonSelectedText: sNonSelectedText,
nSelectedText: sNSelectedText,
@@ -559,7 +560,10 @@ $(document).ready(function() {
if(rows=="") { /* All in grid */
$.post(
getSearchIDs,
- { searchcondition: jQuery('#displayparticipants').jqGrid('getGridParam','url')},
+ {
+ searchcondition: searchconditions,
+ searchURL: jQuery('#displayparticipants').jqGrid('getGridParam', 'url')
+ },
function(data) {
$('#count').val(totalitems);
$('#participant_id').val(data);
@@ -640,84 +644,10 @@ $(document).ready(function() {
return path.replace(/\\/g,'/').replace( /.*\//, '' );
}
- $('#addtosurvey').click(function() {
- var selected = "";
- var myGrid = $("#displayparticipants").jqGrid();
- /* the rows variable will contain the UUID of individual items that been ticked in the jqGrid */
- /* if it is empty, then no items have been ticked */
- var rows = myGrid.getGridParam('selarrrow');
-
- if(rows=="") {
- var totalitems = myGrid.getGridParam('records');
- $('#allinview').text(addAllInViewTxt.replace('%s', totalitems));
- $('#allinview').show();
- $('#selecteditems').hide();
- } else {
- var totalitems = rows.length;
- $('#selecteditems').text(addSelectedItemsTxt.replace('%s', totalitems));
- $('#selecteditems').show();
- $('#allinview').hide();
- }
-
- var dialog_buttons={};
- dialog_buttons[mapButton]=function(){
- var survey_id=$('#survey_id').val();
- var redirect ="";
- if(survey_id===null) {
- /* No survey has been selected */
- alert(selectSurvey);
- } else {
- /* Check if user wants to see token table after adding new participants */
- if(jQuery('#redirect').is(":checked")) {
- redirect = "redirect";
- } else {
- redirect = "";
- }
- /* Submit the form with appropriate options depending on whether
- individual users are selected, or the whole grid is to be copied */
- if(rows=="") { /* All in grid */
- $.post(
- getSearchIDs,
- { searchcondition: jQuery('#displayparticipants').jqGrid('getGridParam','url')},
- function(data) {
- $('#count').val(totalitems);
- $('#participant_id').val(data);
- $("#addsurvey").submit();
- });
- } else { /* Add selected (checked) jqGrid items only */
- rows = myGrid.getGridParam('selarrrow');
- $('#count').val(totalitems);
- $('#participant_id').val(rows);
- $("#addsurvey").submit();
- }
- }
- };
- dialog_buttons[cancelBtn]=function(){
- $(this).dialog("close");
- };
- /* End of building array containing button functions */
-
- $("#addsurvey").dialog({
- height: 500,
- width: 500,
- title : addsurvey,
- modal: true,
- open: function(event, ui) {
- $('#addsurvey').dialog('option', 'title', addsurvey + ' ('+totalitems+')');
- },
- buttons: dialog_buttons
- });
-
- if (!($("#survey_id").length > 0)) {
- $('#addsurvey').html(addpartErrorMsg);
- }
- });
-
function editModifier(id, subgrid_id, method) {
var parid = id.split('_');
var participant_id = $("#displayparticipants_"+parid[0]+"_t").getCell(id,'participant_id');
- var lsel = parid[0];
- var can_edit = ($('#displayparticipants').getCell(participant_id,'can_edit')=='true' && bEditPermission);
+ var can_edit = ($('#displayparticipants').getCell(parid[0],'can_edit')=='true' && bEditPermission);
if(!can_edit) {
var dialog_buttons={};
dialog_buttons[okBtn]=function(){
@@ -747,7 +677,7 @@ $(document).ready(function() {
$("#displayparticipants_"+parid[0]+"_t").setColProp('attvalue',{ editoptions:''});
}
if(method=='edit') {
- jQuery("#displayparticipants_"+parid[0]+"_t").jqGrid('restoreRow',id);
+ // jQuery("#displayparticipants_"+parid[0]+"_t").jqGrid('restoreRow',id);
}
if(method=='click') {
jQuery("#displayparticipants_"+parid[0]+"_t").jqGrid('restoreRow',id);
diff --git a/scripts/admin/tokens.js b/scripts/admin/tokens.js
index c787f76d1df..9b01fdaae0d 100644
--- a/scripts/admin/tokens.js
+++ b/scripts/admin/tokens.js
@@ -66,13 +66,6 @@ function addSelectedParticipantsToCPDB()
$(document).ready(function() {
- $("#filterduplicatetoken").change(function(){
- if ($("#filterduplicatetoken").prop('checked')) {
- $("#lifilterduplicatefields").slideDown();
- } else {
- $("#lifilterduplicatefields").slideUp();
- }
- })
// Code for AJAX download
jQuery.download = function(url, data, method){
//url and data options required
@@ -118,7 +111,7 @@ $(document).ready(function() {
$('#searchbutton').click(function(){
});
- var lastSel,lastSel2;
+
oGrid=jQuery("#displaytokens").jqGrid({
loadtext : sLoadText,
recordtext: sRecordText,
diff --git a/scripts/admin/tokensimport.js b/scripts/admin/tokensimport.js
new file mode 100644
index 00000000000..cc6c08522c9
--- /dev/null
+++ b/scripts/admin/tokensimport.js
@@ -0,0 +1,10 @@
+$(document).ready(function() {
+
+ $("#filterduplicatetoken").change(function(){
+ if ($("#filterduplicatetoken").prop('checked')) {
+ $("#lifilterduplicatefields").slideDown();
+ } else {
+ $("#lifilterduplicatefields").slideUp();
+ }
+ });
+});