http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88427
Revision: 88427
Author: jeroendedauw
Date: 2011-05-19 20:53:18 +0000 (Thu, 19 May 2011)
Log Message:
-----------
implemented watchlist group delete stuff
Modified Paths:
--------------
trunk/extensions/SemanticWatchlist/api/ApiDeleteWatchlistGroup.php
trunk/extensions/SemanticWatchlist/specials/jquery.watchlistcondition.js
Modified: trunk/extensions/SemanticWatchlist/api/ApiDeleteWatchlistGroup.php
===================================================================
--- trunk/extensions/SemanticWatchlist/api/ApiDeleteWatchlistGroup.php
2011-05-19 20:27:44 UTC (rev 88426)
+++ trunk/extensions/SemanticWatchlist/api/ApiDeleteWatchlistGroup.php
2011-05-19 20:53:18 UTC (rev 88427)
@@ -27,18 +27,29 @@
$params = $this->extractRequestParams();
+ $everythingOk = true;
+
$dbw = wfGetDB( DB_MASTER );
-
$dbw->begin();
foreach ( $params['ids'] as $id ) {
- $dbw->delete(
+ $result = $dbw->delete(
'swl_groups',
array( 'group_id' => $id )
- );
+ );
+
+ if ( $result === false ) {
+ $everythingOk = false;
+ }
}
$dbw->commit();
+
+ $this->getResult()->addValue(
+ null,
+ 'success',
+ $everythingOk
+ );
}
public function getAllowedParams() {
Modified:
trunk/extensions/SemanticWatchlist/specials/jquery.watchlistcondition.js
===================================================================
--- trunk/extensions/SemanticWatchlist/specials/jquery.watchlistcondition.js
2011-05-19 20:27:44 UTC (rev 88426)
+++ trunk/extensions/SemanticWatchlist/specials/jquery.watchlistcondition.js
2011-05-19 20:53:18 UTC (rev 88427)
@@ -99,7 +99,16 @@
} ).click( function() {
if ( confirm( mediaWiki.msg(
'swl-group-confirmdelete', self.nameInput.val() ) ) ) {
this.disabled = true;
- self.doDelete( function() {
this.disabled = false; } );
+
+ self.doDelete( function( success ) {
+ if ( success ) {
+ self.slideUp( 'fast' );
+ }
+ else {
+ alert( 'Could not
delete the watchlist group.' );
+ this.disabled = false;
+ }
+ } );
}
} )
);
@@ -148,7 +157,7 @@
'ids': this.group.id
},
function( data ) {
- callback();
+ callback( data.success );
}
);
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
