Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/291230
Change subject: BsPageTemplates/BsResponsibleEditors: Remove Loadmask workaround
......................................................................
BsPageTemplates/BsResponsibleEditors: Remove Loadmask workaround
Change-Id: I5cef2ca88294b6179863a1e2a7f60fd3020bd417
---
M PageTemplates/resources/BS.PageTemplates/Panel.js
M ResponsibleEditors/resources/BS.ResponsibleEditors/AssignmentDialog.js
2 files changed, 67 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/30/291230/1
diff --git a/PageTemplates/resources/BS.PageTemplates/Panel.js
b/PageTemplates/resources/BS.PageTemplates/Panel.js
index c021bed..21e048d 100644
--- a/PageTemplates/resources/BS.PageTemplates/Panel.js
+++ b/PageTemplates/resources/BS.PageTemplates/Panel.js
@@ -118,10 +118,32 @@
onDlgTemplateAddOk: function( data, template ) {
this.dlgTemplateAdd.setLoading();
var me = this;
+
+ //copy from bluespice.api.js, cause we need to set "loading" to
false
+ var cfg = {
+ failure: function( response, module, task, $dfd, cfg ) {
+ var message = response.message || '';
+ if ( response.errors.length > 0 ) {
+ for ( var i in response.errors ) {
+ if ( typeof(
response.errors[i].message ) !== 'string' ) continue;
+ message = message + '<br />' +
response.errors[i].message;
+ }
+ }
+ bs.util.alert( module + '-' + task + '-fail', {
+ titleMsg:
'bs-extjs-title-warning',
+ text: message
+ }, {
+ ok: function() {
+
me.dlgTemplateAdd.setLoading( false );
+ }}
+ );
+ }
+ };
bs.api.tasks.exec(
'pagetemplates',
'doEditTemplate',
- template
+ template,
+ cfg
).done( function() {
me.dlgTemplateAdd.setLoading(false);
me.dlgTemplateAdd.resetData();
@@ -132,10 +154,31 @@
onDlgTemplateEditOk: function( data, template ) {
this.dlgTemplateEdit.setLoading();
var me = this;
+ //copy from bluespice.api.js, cause we need to set "loading" to
false
+ var cfg = {
+ failure: function( response, module, task, $dfd, cfg ) {
+ var message = response.message || '';
+ if ( response.errors.length > 0 ) {
+ for ( var i in response.errors ) {
+ if ( typeof(
response.errors[i].message ) !== 'string' ) continue;
+ message = message + '<br />' +
response.errors[i].message;
+ }
+ }
+ bs.util.alert( module + '-' + task + '-fail', {
+ titleMsg:
'bs-extjs-title-warning',
+ text: message
+ }, {
+ ok: function() {
+
me.dlgTemplateAdd.setLoading( false );
+ }}
+ );
+ }
+ };
bs.api.tasks.exec(
'pagetemplates',
'doEditTemplate',
- template
+ template,
+ cfg
).done( function() {
me.dlgTemplateEdit.setLoading(false);
me.dlgTemplateEdit.resetData();
diff --git
a/ResponsibleEditors/resources/BS.ResponsibleEditors/AssignmentDialog.js
b/ResponsibleEditors/resources/BS.ResponsibleEditors/AssignmentDialog.js
index 3161823..d0f2e6d 100644
--- a/ResponsibleEditors/resources/BS.ResponsibleEditors/AssignmentDialog.js
+++ b/ResponsibleEditors/resources/BS.ResponsibleEditors/AssignmentDialog.js
@@ -28,10 +28,31 @@
this.showLoadMask();
var me = this;
+ //copy from bluespice.api.js, cause we need to set "loading" to
false
+ var cfg = {
+ failure: function( response, module, task, $dfd, cfg ) {
+ var message = response.message || '';
+ if ( response.errors.length > 0 ) {
+ for ( var i in response.errors ) {
+ if ( typeof(
response.errors[i].message ) !== 'string' ) continue;
+ message = message + '<br />' +
response.errors[i].message;
+ }
+ }
+ bs.util.alert( module + '-' + task + '-fail', {
+ titleMsg:
'bs-extjs-title-warning',
+ text: message
+ }, {
+ ok: function() {
+ me.hideLoadMask();
+ }}
+ );
+ }
+ };
bs.api.tasks.exec(
'responsibleeditors',
'setResponsibleEditors',
- me.getData()
+ me.getData(),
+ cfg
).done( function() {
me.fireEvent( 'ok', this, me.getData() );
me.hideLoadMask();
--
To view, visit https://gerrit.wikimedia.org/r/291230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cef2ca88294b6179863a1e2a7f60fd3020bd417
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
