https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112965
Revision: 112965
Author: jeroendedauw
Date: 2012-03-03 21:54:23 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
Follow up to r112963; fix var definition and improved error handling
Modified Paths:
--------------
trunk/extensions/EducationProgram/EducationProgram.i18n.php
trunk/extensions/EducationProgram/EducationProgram.php
trunk/extensions/EducationProgram/resources/ep.enlist.js
Modified: trunk/extensions/EducationProgram/EducationProgram.i18n.php
===================================================================
--- trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-03-03
21:32:20 UTC (rev 112964)
+++ trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-03-03
21:54:23 UTC (rev 112965)
@@ -627,6 +627,7 @@
'ep-instructor-addittion-success' => '$1 has been successfully added as
{{GENDER:$1|instructor}} for course $2!',
'ep-instructor-addittion-self-success' => 'You have been successfully
added as {{GENDER:$1|instructor}} for course $2!',
'ep-instructor-addittion-null' => '$1 has already been added as
{{GENDER:$1|instructor}} to course $2',
+ 'ep-instructor-addittion-invalid-user' => 'There is no user with name
$1, so no one has been added to course $2',
'ep-instructor-add-close-button' => 'Close',
'ep-instructor-add-retry' => 'Retry',
'ep-instructor-addittion-failed' => 'Something went wrong - could not
add the instructor to the course.',
@@ -654,6 +655,7 @@
'ep-online-addittion-success' => '$1 has been successfully added as
{{GENDER:$1|Online Ambassador}} for course $2!',
'ep-online-addittion-self-success' => 'You have been successfully added
as {{GENDER:$1|Online Ambassador}} for course $2!',
'ep-online-addittion-null' => '$1 has already been added as
{{GENDER:$1|Online Ambassador}} to course $2',
+ 'ep-online-addittion-invalid-user' => 'There is no user with name $1,
so no one has been added to course $2',
'ep-online-add-close-button' => 'Close',
'ep-online-add-retry' => 'Retry',
'ep-online-addittion-failed' => 'Something went wrong - could not add
the Online Ambassador to the course.',
@@ -681,6 +683,7 @@
'ep-campus-addittion-success' => '$1 has been successfully added as
{{GENDER:$1|Campus Ambassador}} for course $2!',
'ep-campus-addittion-self-success' => 'You have been successfully added
as {{GENDER:$1|Campus Ambassador}} for course $2!',
'ep-campus-addittion-null' => '$1 has already been added as
{{GENDER:$1|Campus Ambassador}} to course $2',
+ 'ep-campus-addittion-invalid-user' => 'There is no user with name $1,
so no one has been added to course $2',
'ep-campus-add-close-button' => 'Close',
'ep-campus-add-retry' => 'Retry',
'ep-campus-addittion-failed' => 'Something went wrong - could not add
the Campus Ambassador to the course.',
Modified: trunk/extensions/EducationProgram/EducationProgram.php
===================================================================
--- trunk/extensions/EducationProgram/EducationProgram.php 2012-03-03
21:32:20 UTC (rev 112964)
+++ trunk/extensions/EducationProgram/EducationProgram.php 2012-03-03
21:54:23 UTC (rev 112965)
@@ -555,6 +555,9 @@
'ep-instructor-addittion-null',
'ep-online-addittion-null',
'ep-campus-addittion-null',
+ 'ep-instructor-addittion-invalid-user',
+ 'ep-online-addittion-invalid-user',
+ 'ep-campus-addittion-invalid-user',
'ep-instructor-add-close-button',
'ep-online-add-close-button',
'ep-campus-add-close-button',
Modified: trunk/extensions/EducationProgram/resources/ep.enlist.js
===================================================================
--- trunk/extensions/EducationProgram/resources/ep.enlist.js 2012-03-03
21:32:20 UTC (rev 112964)
+++ trunk/extensions/EducationProgram/resources/ep.enlist.js 2012-03-03
21:54:23 UTC (rev 112965)
@@ -108,7 +108,8 @@
$( '.ep-add-role' ).click( function( event ) {
var $this = $( this ),
_this = this,
- role = $this.attr( 'data-role' );
+ role = $this.attr( 'data-role' ),
+ isCompletionEnter = false;
this.courseId = $this.attr( 'data-courseid' );
this.courseName = $this.attr( 'data-coursename' );
@@ -137,8 +138,7 @@
this.doAdd = function() {
var $add = $( '#ep-' + role + '-add-button' ),
- $cancel = $( '#ep-' + role +
'-add-cancel-button' ),
- isCompletionEnter = false;
+ $cancel = $( '#ep-' + role +
'-add-cancel-button' );
$add.button( 'option', 'disabled', true );
$add.button( 'option', 'label', ep.msg( 'ep-' +
role + '-adding' ) );
@@ -180,11 +180,16 @@
$ul.append( $( '<li>' ).text(
_this.getName() ) );
}
} ).fail( function( data ) {
- // TODO: implement nicer handling for
fails caused by invalid user name
-
$add.button( 'option', 'disabled',
false );
$add.button( 'option', 'label', ep.msg(
'ep-' + role + '-add-retry' ) );
- alert( ep.msg( 'ep-' + role +
'-addittion-failed' ) );
+
+ var msgKey = data.error ? 'ep-' + role
+ '-addittion-' + data.error.code : 'ep-' + role + '-addittion-failed';
+
+ alert( ep.msg(
+ msgKey,
+ _this.getName(),
+ _this.courseName
+ ) );
} );
};
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
