https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110552
Revision: 110552
Author: jeroendedauw
Date: 2012-02-02 08:03:59 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
fix edit issue
Modified Paths:
--------------
trunk/extensions/EducationProgram/EducationProgram.i18n.php
trunk/extensions/EducationProgram/actions/EPEditAction.php
trunk/extensions/EducationProgram/actions/EditCourseAction.php
trunk/extensions/EducationProgram/actions/EditOrgAction.php
Modified: trunk/extensions/EducationProgram/EducationProgram.i18n.php
===================================================================
--- trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-02-02
03:02:50 UTC (rev 110551)
+++ trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-02-02
08:03:59 UTC (rev 110552)
@@ -301,7 +301,7 @@
'ep-course-students' => 'Students',
'ep-course-none' => 'There is no course with id "$1". See
[[Special:Courses|here]] for a list of courses.',
'ep-course-create' => 'There is no course with id "$1", but you can
create a new one.',
- 'ep-course-description' => 'description',
+ 'ep-course-description' => 'Description',
'ep-course-no-online' => '',
'viewcourseaction-summary-org' => 'Institution',
'viewcourseaction-summary-term' => 'Term',
Modified: trunk/extensions/EducationProgram/actions/EPEditAction.php
===================================================================
--- trunk/extensions/EducationProgram/actions/EPEditAction.php 2012-02-02
03:02:50 UTC (rev 110551)
+++ trunk/extensions/EducationProgram/actions/EPEditAction.php 2012-02-02
08:03:59 UTC (rev 110552)
@@ -160,17 +160,15 @@
protected function getNewData() {
$data = array();
- if ( $this->isNew() ) {
- if ( $this->isNewPost() ) {
- $data['name'] = $this->getRequest()->getVal(
'newname' );
- }
- else {
- $data['name'] = $this->getTitle()->getText();
- }
-
- $data['name'] = $this->getLanguage()->ucfirst(
$data['name'] );
+ if ( $this->isNewPost() ) {
+ $data['name'] = $this->getRequest()->getVal( 'newname'
);
}
+ else {
+ $data['name'] = $this->getTitle()->getText();
+ }
+ $data['name'] = $this->getLanguage()->ucfirst( $data['name'] );
+
return $data;
}
Modified: trunk/extensions/EducationProgram/actions/EditCourseAction.php
===================================================================
--- trunk/extensions/EducationProgram/actions/EditCourseAction.php
2012-02-02 03:02:50 UTC (rev 110551)
+++ trunk/extensions/EducationProgram/actions/EditCourseAction.php
2012-02-02 08:03:59 UTC (rev 110552)
@@ -67,7 +67,7 @@
/**
* (non-PHPdoc)
- * @see SpecialEPFormPage::getFormFields()
+ * @see EPEditAction::getFormFields()
* @return array
*/
protected function getFormFields() {
@@ -183,20 +183,23 @@
/**
* (non-PHPdoc)
- * @see SpecialEPFormPage::getNewData()
+ * @see EPEditAction::getNewData()
*/
protected function getNewData() {
$data = parent::getNewData();
- if ( $this->isNew() ) {
+ if ( $this->isNewPost() ) {
$data['org_id'] = $this->getRequest()->getVal( 'neworg'
);
+
$data['name'] = wfMsgExt(
'ep-course-edit-name-format',
'parsemag',
$data['name'],
$this->getRequest()->getVal( 'newterm' )
);
+
$data['term'] = $this->getRequest()->getVal( 'newterm'
);
+
$data['mc'] = $data['name'];
}
@@ -205,7 +208,7 @@
/**
* (non-PHPdoc)
- * @see SpecialEPFormPage::handleKnownField()
+ * @see EPEditAction::handleKnownField()
*/
protected function handleKnownField( $name, $value ) {
if ( in_array( $name, array( 'end', 'start' ) ) ) {
Modified: trunk/extensions/EducationProgram/actions/EditOrgAction.php
===================================================================
--- trunk/extensions/EducationProgram/actions/EditOrgAction.php 2012-02-02
03:02:50 UTC (rev 110551)
+++ trunk/extensions/EducationProgram/actions/EditOrgAction.php 2012-02-02
08:03:59 UTC (rev 110552)
@@ -29,7 +29,7 @@
/**
* (non-PHPdoc)
- * @see SpecialEPFormPage::getFormFields()
+ * @see EPEditAction::getFormFields()
* @return array
*/
protected function getFormFields() {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
