Bsitu has uploaded a new change for review. https://gerrit.wikimedia.org/r/130772
Change subject: Revision single and diff view ...................................................................... Revision single and diff view Change-Id: I533da49a42d186c1958bab0b26147f8522ba30ed --- M Flow.php M includes/Block/Header.php A includes/Formatter/RevisionViewFormatter.php A includes/Formatter/RevisionViewQuery.php A includes/Formatter/RevisionViewRow.php 5 files changed, 60 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/72/130772/1 diff --git a/Flow.php b/Flow.php index 84cf6bd..17ae113 100755 --- a/Flow.php +++ b/Flow.php @@ -182,6 +182,9 @@ $wgAutoloadClasses['Flow\Formatter\TopicHistoryQuery'] = $dir . 'includes/Formatter/TopicHistoryQuery.php'; $wgAutoloadClasses['Flow\Formatter\TopicRow'] = $dir . 'includes/Formatter/TopicRow.php'; $wgAutoloadClasses['Flow\Formatter\IRCLineUrlFormatter'] = $dir . 'includes/Formatter/IRCLineUrlFormatter.php'; +$wgAutoloadClasses['Flow\Formatter\RevisionViewFormatter'] = $dir . 'includes/Formatter/RevisionViewFormatter.php'; +$wgAutoloadClasses['Flow\Formatter\RevisionViewQuery'] = $dir . 'includes/Formatter/RevisionViewQuery.php'; +$wgAutoloadClasses['Flow\Formatter\RevisionViewRow'] = $dir . 'includes/Formatter/RevisionViewRow.php'; // Convert model instances into array of user-visible data $wgAutoloadClasses['Flow\Formatter\RevisionFormatter'] = $dir . 'includes/Formatter/RevisionFormatter.php'; diff --git a/includes/Block/Header.php b/includes/Block/Header.php index 34eb5c4..04c54c0 100644 --- a/includes/Block/Header.php +++ b/includes/Block/Header.php @@ -178,6 +178,33 @@ 'editToken' => $this->getEditToken(), ); + switch ( $this->action ) { + case 'view': + case 'header-view': + case 'edit-header': + $output += $this->renderRevisionAPI(); + break; + + case 'compare-header-revisions': + + break; + } + + if ( $this->wasSubmitted() ) { + $output += array( + 'submitted' => $this->submitted, + 'errors' => $this->errors, + ); + } + return $output; + } + + protected function renderDiffAPI() { + + } + + protected function renderRevisionAPI() { + $output = array(); if ( $this->header === null ) { $output['missing'] = 'missing'; } else { @@ -193,13 +220,6 @@ } $output['revision'] = Container::get( 'formatter.revision' )->formatApi( $row, $ctx ); - } - - if ( $this->wasSubmitted() ) { - $output += array( - 'submitted' => $this->submitted, - 'errors' => $this->errors, - ); } return $output; } diff --git a/includes/Formatter/RevisionViewFormatter.php b/includes/Formatter/RevisionViewFormatter.php new file mode 100644 index 0000000..ec8a0b1 --- /dev/null +++ b/includes/Formatter/RevisionViewFormatter.php @@ -0,0 +1,7 @@ +<?php + +namespace Flow\Formatter; + +class RevisionViewFormatter extends RevisionFormatter { + // @Todo - Pull the data from RevisionView +} diff --git a/includes/Formatter/RevisionViewQuery.php b/includes/Formatter/RevisionViewQuery.php new file mode 100644 index 0000000..20cc110 --- /dev/null +++ b/includes/Formatter/RevisionViewQuery.php @@ -0,0 +1,14 @@ +<?php + +namespace Flow\Formatter; + +class RevisionViewQuery extends AbstractQuery { + + public function getSingleViewResult( UUID $revision ) { + // @Todo - Pull the data from RevisionView + } + + public function getDiffViewResult( UUID $new, UUID $prev = null ) { + // @Todo - Pull the data from RevisionView + } +} diff --git a/includes/Formatter/RevisionViewRow.php b/includes/Formatter/RevisionViewRow.php new file mode 100644 index 0000000..4f14e1b --- /dev/null +++ b/includes/Formatter/RevisionViewRow.php @@ -0,0 +1,9 @@ +<?php + +namespace Flow\Formatter; + +class RevisionViewRow extends FormatterRow { + public $singleViewHeader; + public $diffViewHeader; + public $diff; +} -- To view, visit https://gerrit.wikimedia.org/r/130772 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I533da49a42d186c1958bab0b26147f8522ba30ed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: frontend-rewrite Gerrit-Owner: Bsitu <bs...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits