Robert Vogel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356175 )
Change subject: BlueSpiceFoundation: added APIDeletePage
......................................................................
BlueSpiceFoundation: added APIDeletePage
codestyling
is used in CategoryManager to delete a category
Change-Id: I9ae48f97ce594de9203c9086a38cae9b368913dc
---
M extension.json
M i18n/deferred/de.json
M i18n/deferred/en.json
M i18n/deferred/qqq.json
M resources/bluespice.extjs/BS/action/APIAddCategories.js
A resources/bluespice.extjs/BS/action/APIDeletePage.js
M resources/bluespice.extjs/BS/action/APIRemoveCategories.js
M resources/bluespice.extjs/BS/action/APISetCategories.js
8 files changed, 72 insertions(+), 30 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 12e9ff0..5733f51 100644
--- a/extension.json
+++ b/extension.json
@@ -294,7 +294,8 @@
"bs-deferred-action-apiaddcategories-description",
"bs-deferred-action-apisetcategories-description",
"bs-deferred-action-apiremovecategories-description",
- "bs-deferred-action-apimovepage-description"
+ "bs-deferred-action-apimovepage-description",
+ "bs-deferred-action-apideletepage-description"
]
},
"ext.bluespice.extjs.BS.portal.css": {
diff --git a/i18n/deferred/de.json b/i18n/deferred/de.json
index d4dcb0c..171cc28 100644
--- a/i18n/deferred/de.json
+++ b/i18n/deferred/de.json
@@ -19,5 +19,6 @@
"bs-deferred-action-apiaddcategories-description": "Kategorien zu „$1“
hinzufügen.",
"bs-deferred-action-apiremovecategories-description": "Kategorien von
„$1“ entfernen.",
"bs-deferred-action-apisetcategories-description": "Kategorien zu „$1“
festlegen.",
- "bs-deferred-action-apimovepage-description": "„$1“ nach „$2“
verschieben."
+ "bs-deferred-action-apimovepage-description": "„$1“ nach „$2“
verschieben.",
+ "bs-deferred-action-apideletepage-description": "„$1“ löschen."
}
diff --git a/i18n/deferred/en.json b/i18n/deferred/en.json
index cc35426..b7350a9 100644
--- a/i18n/deferred/en.json
+++ b/i18n/deferred/en.json
@@ -18,5 +18,6 @@
"bs-deferred-action-apiaddcategories-description": "Add categories to
'$1'.",
"bs-deferred-action-apiremovecategories-description": "Remove
categories from '$1'.",
"bs-deferred-action-apisetcategories-description": "Set categories on
'$1'.",
- "bs-deferred-action-apimovepage-description": "Move \"$1\" to \"$2\"."
+ "bs-deferred-action-apimovepage-description": "Move \"$1\" to \"$2\".",
+ "bs-deferred-action-apideletepage-description": "Delete \"$1\"."
}
diff --git a/i18n/deferred/qqq.json b/i18n/deferred/qqq.json
index dbd9c98..82f2ccd 100644
--- a/i18n/deferred/qqq.json
+++ b/i18n/deferred/qqq.json
@@ -19,5 +19,6 @@
"bs-deferred-action-apiaddcategories-description": "Description of an
action that adds a set of categories to existing set of categories on a
page.\n\nParameters:\n* $1 - The page title that is being modified",
"bs-deferred-action-apiremovecategories-description": "Description of
an action that removes a set of categories to a page.\n\nParameters:\n* $1 -
The page title that is being modified",
"bs-deferred-action-apisetcategories-description": "Description of an
action that adds a set of categories to a page with removing existing
ones.\n\nParameters:\n* $1 - The page title that is being modified",
- "bs-deferred-action-apimovepage-description": "Description of an action
that moves a page.\n\nParameters:\n* $1 - The source page title to be moved
from\n* $2 - The target page title to be moved to"
+ "bs-deferred-action-apimovepage-description": "Description of an action
that moves a page.\n\nParameters:\n* $1 - The source page title to be moved
from\n* $2 - The target page title to be moved to",
+ "bs-deferred-action-apideletepage-description": "Description of an
action that deletes a page.\n\nParameters:\n* $1 - The page title to be deleted"
}
diff --git a/resources/bluespice.extjs/BS/action/APIAddCategories.js
b/resources/bluespice.extjs/BS/action/APIAddCategories.js
index e3bc019..4404b73 100644
--- a/resources/bluespice.extjs/BS/action/APIAddCategories.js
+++ b/resources/bluespice.extjs/BS/action/APIAddCategories.js
@@ -3,10 +3,6 @@
categories: [],
pageTitle: '',
- contructor: function(){
- this.callParent( arguments );
- },
-
execute: function(){
var dfd = $.Deferred();
this.actionStatus = BS.action.Base.STATUS_RUNNING;
@@ -22,6 +18,8 @@
},
doAPIAddCategories: function( dfd, set ){
+ var me = this;
+
var taskData = {
page_title: set.page_title,
categories: set.categories
@@ -30,16 +28,16 @@
'wikipage', 'addCategories', taskData
)
.fail(function( response ){
- this.actionStatus = BS.action.Base.STATUS_ERROR;
- dfd.reject( this, set, response);
+ me.actionStatus = BS.action.Base.STATUS_ERROR;
+ dfd.reject( me, set, response);
})
.done(function( response ) {
if( !response.success ){
- this.actionStatus = BS.action.Base.STATUS_ERROR;
- dfd.reject( this, set, response );
+ me.actionStatus = BS.action.Base.STATUS_ERROR;
+ dfd.reject( me, set, response );
}
this.actionStatus = BS.action.Base.STATUS_DONE;
- dfd.resolve( this );
+ dfd.resolve( me );
});
},
diff --git a/resources/bluespice.extjs/BS/action/APIDeletePage.js
b/resources/bluespice.extjs/BS/action/APIDeletePage.js
new file mode 100755
index 0000000..9fc94dc
--- /dev/null
+++ b/resources/bluespice.extjs/BS/action/APIDeletePage.js
@@ -0,0 +1,43 @@
+Ext.define( 'BS.action.APIDeletePage', {
+ extend: 'BS.action.Base',
+
+ //Custom config
+ pageTitle: '',
+
+ execute: function () {
+ var dfd = $.Deferred();
+ this.actionStatus = BS.action.Base.STATUS_RUNNING;
+
+ this.doAPIDelete( dfd );
+
+ return dfd.promise();
+ },
+
+ doAPIDelete: function ( dfd ) {
+ var me = this;
+
+ var deletePageAPI = new mw.Api();
+ deletePageAPI.postWithToken( 'csrf', {
+ 'action': 'delete',
+ 'title': me.pageTitle
+ })
+ .fail( function ( code, errResp ) {
+ me.actionStatus = BS.action.Base.STATUS_ERROR;
+ dfd.reject( me, errResp );
+ })
+ .done( function ( resp, jqXHR ) {
+ if ( resp.delete.title === undefined ) {
+ me.actionStatus = BS.action.Base.STATUS_ERROR;
+ dfd.reject( me, resp );
+ return;
+ }
+
+ me.actionStatus = BS.action.Base.STATUS_DONE;
+ dfd.resolve( me );
+ });
+ },
+
+ getDescription: function () {
+ return mw.message(
'bs-deferred-action-apideletepage-description', this.pageTitle ).parse();
+ }
+});
\ No newline at end of file
diff --git a/resources/bluespice.extjs/BS/action/APIRemoveCategories.js
b/resources/bluespice.extjs/BS/action/APIRemoveCategories.js
old mode 100644
new mode 100755
index 199cdd3..26883e4
--- a/resources/bluespice.extjs/BS/action/APIRemoveCategories.js
+++ b/resources/bluespice.extjs/BS/action/APIRemoveCategories.js
@@ -4,10 +4,6 @@
categories: [],
pageTitle: '',
- contructor: function(){
- this.callParent(arguments);
- },
-
execute: function(){
var dfd = $.Deferred();
this.actionStatus = BS.action.Base.STATUS_RUNNING;
@@ -23,6 +19,8 @@
},
doAPIRemoveCategories: function( dfd, set ){
+ var me = this;
+
var taskData = {
page_title: set.page_title,
categories: set.categories
@@ -31,16 +29,16 @@
'wikipage', 'removeCategories', taskData
)
.fail(function( response ){
- this.actionStatus = BS.action.Base.STATUS_ERROR;
- dfd.reject( this, set, response );
+ me.actionStatus = BS.action.Base.STATUS_ERROR;
+ dfd.reject( me, set, response );
})
.done(function( response ) {
if( !response.success ){
- this.actionStatus = BS.action.Base.STATUS_ERROR;
- dfd.reject( this, set, response );
+ me.actionStatus = BS.action.Base.STATUS_ERROR;
+ dfd.reject( me, set, response );
}
- this.actionStatus = BS.action.Base.STATUS_DONE;
- dfd.resolve( this );
+ me.actionStatus = BS.action.Base.STATUS_DONE;
+ dfd.resolve( me );
});
},
diff --git a/resources/bluespice.extjs/BS/action/APISetCategories.js
b/resources/bluespice.extjs/BS/action/APISetCategories.js
index c508f53..58f0863 100644
--- a/resources/bluespice.extjs/BS/action/APISetCategories.js
+++ b/resources/bluespice.extjs/BS/action/APISetCategories.js
@@ -4,10 +4,6 @@
categories: [],
pageTitle: '',
- contructor: function(){
- this.callParent( arguments );
- },
-
execute: function(){
var dfd = $.Deferred();
this.actionStatus = BS.action.Base.STATUS_RUNNING;
@@ -23,6 +19,8 @@
},
doAPISetCategories: function( dfd, set ){
+ var me = this;
+
var taskData = {
page_title: set.page_title,
categories: set.categories
@@ -32,15 +30,16 @@
)
.fail(function( response ){
this.actionStatus = BS.action.Base.STATUS_ERROR;
- dfd.reject( this, set, response );
+ dfd.reject( me, set, response );
})
.done(function( response ) {
if( !response.success ){
this.actionStatus = BS.action.Base.STATUS_ERROR;
- dfd.reject( this, set, response );
+ dfd.reject( me, set, response );
}
+
this.actionStatus = BS.action.Base.STATUS_DONE;
- dfd.resolve( this );
+ dfd.resolve( me );
});
},
--
To view, visit https://gerrit.wikimedia.org/r/356175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ae48f97ce594de9203c9086a38cae9b368913dc
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27
Gerrit-Owner: Nasty <[email protected]>
Gerrit-Reviewer: Ljonka <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pwirth <[email protected]>
Gerrit-Reviewer: Raimond Spekking <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
