http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96017
Revision: 96017
Author: jeroendedauw
Date: 2011-09-01 17:40:26 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
work on survey admin
Modified Paths:
--------------
trunk/extensions/Survey/api/ApiDeleteSurvey.php
trunk/extensions/Survey/resources/ext.survey.special.surveys.js
trunk/extensions/Survey/specials/SpecialSurvey.php
trunk/extensions/Survey/specials/SpecialSurveys.php
Modified: trunk/extensions/Survey/api/ApiDeleteSurvey.php
===================================================================
--- trunk/extensions/Survey/api/ApiDeleteSurvey.php 2011-09-01 17:25:33 UTC
(rev 96016)
+++ trunk/extensions/Survey/api/ApiDeleteSurvey.php 2011-09-01 17:40:26 UTC
(rev 96017)
@@ -23,7 +23,7 @@
if ( !$wgUser->isAllowed( 'surveyadmin' ) ||
$wgUser->isBlocked() ) {
$this->dieUsageMsg( array( 'badaccess-groups' ) );
- }
+ }
$params = $this->extractRequestParams();
@@ -46,7 +46,7 @@
}
public function getTokenSalt() {
- return '';
+ return 'deletesurvey';
}
public function getAllowedParams() {
Modified: trunk/extensions/Survey/resources/ext.survey.special.surveys.js
===================================================================
--- trunk/extensions/Survey/resources/ext.survey.special.surveys.js
2011-09-01 17:25:33 UTC (rev 96016)
+++ trunk/extensions/Survey/resources/ext.survey.special.surveys.js
2011-09-01 17:40:26 UTC (rev 96017)
@@ -9,12 +9,13 @@
(function( $ ) { $( document ).ready( function() {
function deleteSurvey( options, successCallback, failCallback ) {
- $.getJSON(
+ $.post(
wgScriptPath + '/api.php',
{
'action': 'deletesurvey',
'format': 'json',
- 'ids': options.id
+ 'ids': options.id,
+ 'token': options.token
},
function( data ) {
if ( data.success ) {
@@ -32,7 +33,10 @@
if ( confirm( survey.msg( 'surveys-special-confirm-delete' ) )
) {
deleteSurvey(
- { id: $this.attr( 'data-survey-id' ) },
+ {
+ id: $this.attr( 'data-survey-id' ),
+ token: $this.attr( 'data-survey-token' )
+ },
function() {
$this.closest( 'tr' ).slideUp( 'slow',
function() { $( this ).remove(); } );
},
Modified: trunk/extensions/Survey/specials/SpecialSurvey.php
===================================================================
--- trunk/extensions/Survey/specials/SpecialSurvey.php 2011-09-01 17:25:33 UTC
(rev 96016)
+++ trunk/extensions/Survey/specials/SpecialSurvey.php 2011-09-01 17:40:26 UTC
(rev 96017)
@@ -46,12 +46,11 @@
}
if ( $survey === false ) {
- $this->showNameError();
+ $survey = new Survey( null, $subPage );
}
- else {
- $this->showSurvey( $survey );
- $this->addModules( 'ext.survey.special.survey'
);
- }
+
+ $this->showSurvey( $survey );
+ $this->addModules( 'ext.survey.special.survey' );
}
}
@@ -132,11 +131,11 @@
}
$question = new SurveyQuestion(
- $questionId,
+ $questionDbId,
0,
$wgRequest->getText( "survey-question-text-$questionId"
),
$wgRequest->getInt( "survey-question-type-$questionId"
),
- $wgRequest->getCheck(
"survey-question-required-$questionDbId" )
+ $wgRequest->getCheck(
"survey-question-required-$questionId" )
);
return $question;
@@ -172,20 +171,16 @@
$fields[] = array(
'type' => 'text',
- //'options' => array(),
- 'default' => 'ohi',
+ 'default' => $survey->getName(),
'label-message' => 'survey-special-label-name',
- 'required' => true,
'id' => 'survey-name',
'name' => 'survey-name',
);
$fields[] = array(
'type' => 'check',
- //'options' => array(),
- 'default' => 'there',
+ 'default' => $survey->isEnabled() ? '1' : '0',
'label-message' => 'survey-special-label-enabled',
- 'required' => true,
'id' => 'survey-enabled',
'name' => 'survey-enabled',
);
@@ -198,7 +193,6 @@
'text' => $question->getText(),
'type' => $question->getType(),
'id' => $question->getId(),
- 'type' => $question->getType(),
)
);
}
@@ -212,9 +206,7 @@
$form = new HTMLForm( $fields );
}
-// $q = new SurveyQuestion( null, 5, 'foo bar', 0, false, array(),
false );
-// var_dump($q->toUrlData());exit;
- $form->displayForm( '' );
+ $form->show();
}
}
Modified: trunk/extensions/Survey/specials/SpecialSurveys.php
===================================================================
--- trunk/extensions/Survey/specials/SpecialSurveys.php 2011-09-01 17:25:33 UTC
(rev 96016)
+++ trunk/extensions/Survey/specials/SpecialSurveys.php 2011-09-01 17:40:26 UTC
(rev 96017)
@@ -162,7 +162,8 @@
array(
'href' => '#',
'class' =>
'survey-delete',
-
'data-survey-id' => $survey->survey_id
+
'data-survey-id' => $survey->survey_id,
+
'data-survey-token' => $GLOBALS['wgUser']->editToken( 'deletesurvey' )
),
wfMsg(
'surveys-special-delete' )
) .
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
