diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
index 8922e6c1ca3..484ec0c92ee 100644
--- a/application/controllers/admin/surveyadmin.php
+++ b/application/controllers/admin/surveyadmin.php
@@ -527,14 +527,12 @@ public function ajaxgetusers()
* @param int $iSurveyID
* @return void
*/
- public function ajaxowneredit($newowner, $iSurveyID)
+ public function ajaxowneredit()
{
header('Content-type: application/json');
-
- $intNewOwner = sanitize_int($newowner);
- $intSurveyId = sanitize_int($iSurveyID);
+ $intNewOwner = sanitize_int(Yii::app()->request->getPost("newowner"));
+ $intSurveyId = sanitize_int(Yii::app()->request->getPost("surveyid"));
$owner_id = Yii::app()->session['loginID'];
-
$query_condition = 'sid=:sid';
$params[':sid']=$intSurveyId;
if (!Permission::model()->hasGlobalPermission('superadmin','create'))
diff --git a/scripts/admin/admin_core.js b/scripts/admin/admin_core.js
index 00a941ff7e1..cbf9189ae6e 100644
--- a/scripts/admin/admin_core.js
+++ b/scripts/admin/admin_core.js
@@ -736,6 +736,8 @@ function tableCellAdapters()
* @param {} checkcode : deprecated
* @param {array} arrayparam
* @param {array} arrayval
+ *
+ * TODO : use $.post
*/
function sendPost(myaction,checkcode,arrayparam,arrayval)
{
@@ -747,10 +749,6 @@ function sendPost(myaction,checkcode,arrayparam,arrayval)
{
addHiddenElement(myform,arrayparam[i],arrayval[i])
}
- if(typeof csrfToken =="undefined")
- {
- csrfToken=$("input[name='YII_CSRF_TOKEN']:first").val();
- }
if(typeof csrfToken =="string")
{
addHiddenElement(myform,'YII_CSRF_TOKEN',csrfToken);
diff --git a/scripts/admin/listsurvey.js b/scripts/admin/listsurvey.js
index 0290aa9ec18..df33ee393d8 100644
--- a/scripts/admin/listsurvey.js
+++ b/scripts/admin/listsurvey.js
@@ -9,20 +9,24 @@ $(document).ready(function(){
var survey_id = ownername_edit_id.slice(15);
var translate_to = $(this).attr('translate_to');
var initial_text = $(this).html();
- $.getJSON(getuserurl,'',function(oData)
- {
- old_owner = $($(oldThis).parent()).html();
-
- old_owner = (old_owner.split("("))[0];
- $($(oldThis).parent()).html('\n'
- + '');
- $(oData).each(function(key,value){
- $('#ownername_select_'+survey_id).
- append($("").
- attr("value",value[0]).
- text(value[1]));
- });
- $("#ownername_select_"+survey_id+ " option[id=opt_"+old_owner+"]").attr("selected","selected");
+ $.post( getuserurl,function( oData ) {
+ if(typeof oData=="object")
+ {
+ old_owner = $($(oldThis).parent()).html();
+ old_owner = (old_owner.split("("))[0];
+ $($(oldThis).parent()).html('\n'
+ + '');
+ $(oData).each(function(key,value){
+ $('#ownername_select_'+survey_id).
+ append($("").
+ attr("value",value[0]).
+ text(value[1]));
+ });
+ $("#ownername_select_"+survey_id+ " option[id=opt_"+old_owner+"]").attr("selected","selected");
+ }
+ //else
+ }).fail(function() {
+ //$notifycontainer.notify("create", 'error-notify', { message:"An error was occured"});// To set in language or in extension (something like lsalert(text, type="default");
});
});
@@ -33,17 +37,18 @@ $(document).ready(function(){
var survey_id = ownername_select_id.slice(17);
var newowner = $("#ownername_select_"+survey_id).val();
var translate_to = $(this).attr('value');
-
- $.getJSON(ownerediturl+'/newowner/' + newowner + '/surveyid/' + survey_id,'', function (data){
-
- var objToUpdate = $($(oldThis).parent());
-
- if (data.record_count>0)
- $(objToUpdate).html(data.newowner);
- else
- $(objToUpdate).html(old_owner);
-
- $(objToUpdate).html($(objToUpdate).html() + ' ('+initial_text+')' );
+ $.post( ownerediturl,{"newowner":newowner,"surveyid":survey_id},function( oData ) {
+ if(typeof oData=="object")// To test json
+ {
+ var objToUpdate = $($(oldThis).parent());
+ if (oData.record_count>0)
+ $(objToUpdate).html(oData.newowner);
+ else
+ $(objToUpdate).html(old_owner);
+ $(objToUpdate).html($(objToUpdate).html() + ' ('+initial_text+')' );
+ }
+ }).fail(function() {
+ //$notifycontainer.notify("create", 'error-notify', { message:"An error was occured"});// To set in language
});
});