https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114461
Revision: 114461
Author: jeroendedauw
Date: 2012-03-23 22:28:47 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
added addstudent right and some missing messages
Modified Paths:
--------------
trunk/extensions/EducationProgram/EducationProgram.i18n.php
trunk/extensions/EducationProgram/EducationProgram.php
trunk/extensions/EducationProgram/api/ApiEnlist.php
Modified: trunk/extensions/EducationProgram/EducationProgram.i18n.php
===================================================================
--- trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-03-23
22:16:24 UTC (rev 114460)
+++ trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-03-23
22:28:47 UTC (rev 114461)
@@ -148,6 +148,8 @@
'right-ep-remreviewer' => 'Remove reviewers from articles',
'right-ep-bulkdelorgs' => 'Bulk delete institutions',
'right-ep-bulkdelcourses' => 'Bulk delete courses',
+ 'right-ep-remarticle' => 'Dissasociate articles from students',
+ 'right-ep-addstudent' => 'Enroll users as student',
// Actions
'action-ep-org' => 'manage institutions',
@@ -165,6 +167,8 @@
'action-ep-remreviewer' => 'remove reviewers from articles',
'action-ep-bulkdelorgs' => 'bulk delete institutions',
'action-ep-bulkdelcourses' => 'bulk delete courses',
+ 'action-ep-remarticle' => 'dissasociate articles from students',
+ 'action-ep-addstudent' => 'enroll users as student',
// Groups
'group-epadmin' => 'Education program admins',
@@ -921,6 +925,8 @@
'right-ep-remreviewer' => '{{doc-right|ep-remreviewer}}',
'right-ep-bulkdelorgs' => '{{doc-right|ep-bulkdelorgs}}',
'right-ep-bulkdelcourses' => '{{doc-right|ep-bulkdelcourses}}',
+ 'right-ep-remarticle' => '{{doc-right|ep-remarticle}}',
+ 'right-ep-addstudent' => '{{doc-right|ep-addstudent}}',
// Actions
'action-ep-org' => '{{doc-action|ep-org}}',
@@ -938,6 +944,8 @@
'action-ep-remreviewer' => '{{doc-action|ep-remreviewer}}',
'action-ep-bulkdelorgs' => '{{doc-action|ep-bulkdelorgs}}',
'action-ep-bulkdelcourses' => '{{doc-action|ep-bulkdelcourses}}',
+ 'action-ep-remarticle' => '{{doc-action|ep-remarticle}}',
+ 'action-ep-addstudent' => '{{doc-action|ep-addstudent}}',
// Groups
'group-epadmin' => '{{group-name}}',
Modified: trunk/extensions/EducationProgram/EducationProgram.php
===================================================================
--- trunk/extensions/EducationProgram/EducationProgram.php 2012-03-23
22:16:24 UTC (rev 114460)
+++ trunk/extensions/EducationProgram/EducationProgram.php 2012-03-23
22:28:47 UTC (rev 114461)
@@ -261,6 +261,7 @@
$wgAvailableRights[] = 'ep-bulkdelorgs'; // Bulk delete institutions
$wgAvailableRights[] = 'ep-bulkdelcourses'; // Bulk delete courses
$wgAvailableRights[] = 'ep-remarticle'; // Remove artiles (from
being student associated)
+$wgAvailableRights[] = 'ep-addstudent'; // Enroll users as
student
// User group rights
@@ -280,6 +281,7 @@
$wgGroupPermissions['*']['ep-bulkdelorgs'] = false;
$wgGroupPermissions['*']['ep-bulkdelcourses'] = false;
$wgGroupPermissions['*']['ep-remarticle'] = false;
+$wgGroupPermissions['*']['ep-addstudent'] = false;
$wgGroupPermissions['epstaff']['ep-org'] = true;
$wgGroupPermissions['epstaff']['ep-course'] = true;
@@ -297,6 +299,7 @@
$wgGroupPermissions['epstaff']['ep-bulkdelorgs'] = true;
$wgGroupPermissions['epstaff']['ep-bulkdelcourses'] = true;
$wgGroupPermissions['epstaff']['ep-remarticle'] = true;
+$wgGroupPermissions['epstaff']['ep-addstudent'] = true;
$wgGroupPermissions['epadmin']['ep-org'] = true;
$wgGroupPermissions['epadmin']['ep-course'] = true;
Modified: trunk/extensions/EducationProgram/api/ApiEnlist.php
===================================================================
--- trunk/extensions/EducationProgram/api/ApiEnlist.php 2012-03-23 22:16:24 UTC
(rev 114460)
+++ trunk/extensions/EducationProgram/api/ApiEnlist.php 2012-03-23 22:28:47 UTC
(rev 114461)
@@ -102,8 +102,8 @@
switch ( $role ) {
case 'student':
- return ( $user->isAllowed( 'ep-enroll' ) &&
$isSelf )
- || ( $isRemove && $user->isAllowed(
'ep-remstudent' ) );
+ return ( $isRemove && $user->isAllowed(
'ep-remstudent' ) )
+ || ( ( $user->isAllowed( 'ep-enroll' )
&& $isSelf ) || $user->isAllowed( 'ep-addstudent' ) );
break;
case 'instructor':
return $user->isAllowed( 'ep-instructor' )
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
