https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113507
Revision: 113507 Author: jeroendedauw Date: 2012-03-09 19:42:01 +0000 (Fri, 09 Mar 2012) Log Message: ----------- added autocompletion to article adittion control Modified Paths: -------------- trunk/extensions/EducationProgram/EducationProgram.php trunk/extensions/EducationProgram/actions/EPDeleteAction.php trunk/extensions/EducationProgram/includes/EPArticleTable.php trunk/extensions/EducationProgram/resources/ep.articletable.js trunk/extensions/EducationProgram/specials/SpecialEPPage.php Modified: trunk/extensions/EducationProgram/EducationProgram.php =================================================================== --- trunk/extensions/EducationProgram/EducationProgram.php 2012-03-09 19:38:54 UTC (rev 113506) +++ trunk/extensions/EducationProgram/EducationProgram.php 2012-03-09 19:42:01 UTC (rev 113507) @@ -466,6 +466,7 @@ 'dependencies' => array( 'jquery.ui.button', 'jquery.ui.dialog', + 'jquery.ui.autocomplete', ), 'messages' => array( 'ep-articletable-addreviwer-title', Modified: trunk/extensions/EducationProgram/actions/EPDeleteAction.php =================================================================== --- trunk/extensions/EducationProgram/actions/EPDeleteAction.php 2012-03-09 19:38:54 UTC (rev 113506) +++ trunk/extensions/EducationProgram/actions/EPDeleteAction.php 2012-03-09 19:42:01 UTC (rev 113507) @@ -59,14 +59,17 @@ if ( $success ) { $title = SpecialPage::getTitleFor( $this->page->getListPage() ); - $query = array( 'deleted' => $this->getTitle()->getText() ); // TODO: handle + $this->getRequest()->setSessionData( + 'epdeleted', + $this->msg( $this->prefixMsg( 'deleted' ) ) + ); } else { $title = $this->getTitle(); - $query = array( 'delfailed' => '1' ); // TODO: handle + $this->getRequest()->setSessionData( 'epdelfailed', true ); } - $this->getOutput()->redirect( $title->getLocalURL( $query ) ); + $this->getOutput()->redirect( $title->getLocalURL() ); } else { $this->displayForm( $object ); Modified: trunk/extensions/EducationProgram/includes/EPArticleTable.php =================================================================== --- trunk/extensions/EducationProgram/includes/EPArticleTable.php 2012-03-09 19:38:54 UTC (rev 113506) +++ trunk/extensions/EducationProgram/includes/EPArticleTable.php 2012-03-09 19:42:01 UTC (rev 113507) @@ -121,7 +121,7 @@ $user = $this->getUser(); $rowCount = array_reduce( $articles, function( /* integer */ $sum, EPArticle $article ) use ( $user ) { - return $sum += max( count( $article->getField( 'reviewers' ) ), 1 ); + return $sum + max( count( $article->getField( 'reviewers' ) ), 1 ); }, 0 ); $html = Html::openElement( 'tr', $this->getRowAttrs( $row ) ); Modified: trunk/extensions/EducationProgram/resources/ep.articletable.js =================================================================== --- trunk/extensions/EducationProgram/resources/ep.articletable.js 2012-03-09 19:38:54 UTC (rev 113506) +++ trunk/extensions/EducationProgram/resources/ep.articletable.js 2012-03-09 19:42:01 UTC (rev 113507) @@ -257,6 +257,36 @@ $( '.ep-rem-student' ).click( removeStudent ); $( '.ep-rem-article' ).click( removeArticle ); + + $( '#addarticlename' ).autocomplete( { // TODO + source: function( request, response ) { + $.getJSON( + wgScriptPath + '/api.php', + { + 'action': 'opensearch', + 'format': 'json', + 'search': request.term, + 'limit': 8 + }, + function( data ) { + response( $.map( data[1], function( item ) { + return { + 'label': item, + 'value': item + }; + } ) ); + } + ); + }, + minLength: 2, + open: function() { + $( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" ); + }, + close: function() { + $( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" ); + } + } ); + } ); })( window.jQuery, mw.educationProgram ); \ No newline at end of file Modified: trunk/extensions/EducationProgram/specials/SpecialEPPage.php =================================================================== --- trunk/extensions/EducationProgram/specials/SpecialEPPage.php 2012-03-09 19:38:54 UTC (rev 113506) +++ trunk/extensions/EducationProgram/specials/SpecialEPPage.php 2012-03-09 19:42:01 UTC (rev 113507) @@ -66,6 +66,11 @@ return false; } + if ( $this->getRequest()->getSessionData( 'epdeleted' ) ) { + $this->showSuccess( $this->getRequest()->getSessionData( 'epdeleted' ) ); + $this->getRequest()->setSessionData( 'epdeleted', false ); + } + return true; } _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs