Revision: 43510
Author:   aaron
Date:     2008-11-14 23:15:13 +0000 (Fri, 14 Nov 2008)

Log Message:
-----------
Remove redundant /path page

Modified Paths:
--------------
    trunk/extensions/CodeReview/CodeReview.php
    trunk/extensions/CodeReview/CodeRevisionListView.php
    trunk/extensions/CodeReview/SpecialCode.php

Removed Paths:
-------------
    trunk/extensions/CodeReview/CodePathRevListView.php

Deleted: trunk/extensions/CodeReview/CodePathRevListView.php
===================================================================
--- trunk/extensions/CodeReview/CodePathRevListView.php 2008-11-14 23:05:48 UTC 
(rev 43509)
+++ trunk/extensions/CodeReview/CodePathRevListView.php 2008-11-14 23:15:13 UTC 
(rev 43510)
@@ -1,45 +0,0 @@
-<?php
-
-// Special:Code/MediaWiki
-class CodePathRevListView extends CodeRevisionListView {
-       function __construct( $repoName ) {
-               parent::__construct( $repoName );
-       }
-
-       function execute() {
-               global $wgOut;
-               if( !$this->mRepo ) {
-                       $view = new CodeRepoListView();
-                       $view->execute();
-                       return;
-               }
-               // No path! Use regular lister!
-               if( !$this->mPath ) {
-                       $view = new CodeRevisionListView( 
$this->mRepo->getName() );
-                       $view->execute();
-                       return;
-               }
-               $this->showForm();
-               // Path should have a bit of length...
-               if( strlen($this->mPath) > 3 ) {
-                       $pager = $this->getPager();
-                       $wgOut->addHTML( 
-                               $pager->getNavigationBar() .
-                               $pager->getLimitForm() . 
-                               $pager->getBody() . 
-                               $pager->getNavigationBar()
-                       );
-               }
-       }
-       
-       function getPager() {
-               return new SvnPathRevTablePager( $this );
-       }
-}
-
-// Pager for CodeRevisionListView
-class SvnPathRevTablePager extends SvnRevTablePager {
-       function getTitle() {
-               return SpecialPage::getTitleFor( 'Code', 
$this->mRepo->getName() . '/path' );
-       }
-}

Modified: trunk/extensions/CodeReview/CodeReview.php
===================================================================
--- trunk/extensions/CodeReview/CodeReview.php  2008-11-14 23:05:48 UTC (rev 
43509)
+++ trunk/extensions/CodeReview/CodeReview.php  2008-11-14 23:15:13 UTC (rev 
43510)
@@ -19,7 +19,7 @@
 
 1) Find out what revisions exist
 2) Get id/author/timestamp/notice basics
-  3) base path helps if available
+3) base path helps if available
 4) get list of affected files
 5) get diffs
 
@@ -54,7 +54,6 @@
 $wgAutoloadClasses['CodeRevisionView'] = $dir . 'CodeRevisionView.php';
 $wgAutoloadClasses['CodeAuthorListView'] = $dir . 'CodeAuthorListView.php';
 $wgAutoloadClasses['CodeStatusListView'] = $dir . 'CodeStatusListView.php';
-$wgAutoloadClasses['CodePathRevListView'] = $dir . 'CodePathRevListView.php';
 $wgAutoloadClasses['CodeTagListView'] = $dir . 'CodeTagListView.php';
 $wgAutoloadClasses['CodeCommentsListView'] = $dir . 'CodeCommentsListView.php';
 $wgAutoloadClasses['CodeComment'] = $dir . 'CodeComment.php';

Modified: trunk/extensions/CodeReview/CodeRevisionListView.php
===================================================================
--- trunk/extensions/CodeReview/CodeRevisionListView.php        2008-11-14 
23:05:48 UTC (rev 43509)
+++ trunk/extensions/CodeReview/CodeRevisionListView.php        2008-11-14 
23:15:13 UTC (rev 43510)
@@ -12,6 +12,7 @@
                        $this->mPath = "/{$this->mPath}"; // make sure this is 
a valid path
                }
                $this->mAuthor = null;
+               $this->mStatus = null;
        }
 
        function execute() {
@@ -35,8 +36,10 @@
                global $wgOut, $wgScript;
                if( $this->mAuthor ) {
                        $special = SpecialPage::getTitleFor( 'Code', 
$this->mRepo->getName().'/author/'.$this->mAuthor );
+               } else if( $this->mStatus ) {
+                       $special = SpecialPage::getTitleFor( 'Code', 
$this->mRepo->getName().'/status/'.$this->mStatus );
                } else {
-                       $special = SpecialPage::getTitleFor( 'Code', 
$this->mRepo->getName().'/path' );
+                       $special = SpecialPage::getTitleFor( 'Code', 
$this->mRepo->getName() );
                }
                $wgOut->addHTML( 
                        Xml::openElement( 'form', array( 'action' => $wgScript, 
'method' => 'get' ) ) .

Modified: trunk/extensions/CodeReview/SpecialCode.php
===================================================================
--- trunk/extensions/CodeReview/SpecialCode.php 2008-11-14 23:05:48 UTC (rev 
43509)
+++ trunk/extensions/CodeReview/SpecialCode.php 2008-11-14 23:15:13 UTC (rev 
43510)
@@ -40,11 +40,9 @@
                                } elseif( $params[1] === 'comments' ) {
                                        $view = new CodeCommentsListView( 
$params[0] );
                                        break;
-                               } elseif( $params[1] === 'path' ) {
-                                       $view = new CodePathRevListView( 
$params[0] );
-                                       break;
                                } else {
-                                       $view = new CodeRevisionView( 
$params[0], $params[1] );
+                                       # Nonsense parameters, back out
+                                       $view = new CodeRevisionListView( 
$params[0] );
                                        break;
                                }
                        case 3:



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to