EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/138629
Change subject: Merge remote-tracking branch 'gerrit/master' into frontend-rewrite ...................................................................... Merge remote-tracking branch 'gerrit/master' into frontend-rewrite Change-Id: I60b5628f2872042ca48977be2f604eb4dd1712be --- M includes/api/ApiFlowBase.php 1 file changed, 0 insertions(+), 93 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/29/138629/1 diff --git a/includes/api/ApiFlowBase.php b/includes/api/ApiFlowBase.php index 0e75246..fd3b497 100644 --- a/includes/api/ApiFlowBase.php +++ b/includes/api/ApiFlowBase.php @@ -119,99 +119,6 @@ ); } -<<<<<<< HEAD (01dab4 Missing handlebars/Makefile dependency) - public function execute() { - $loader = $this->getLoader(); - $blocks = $loader->createBlocks(); - /** @var \Flow\Model\Workflow $workflow */ - $workflow = $loader->getWorkflow(); - $action = $this->getAction(); - $controller = $this->getOccupationController(); - $user = $this->getUser(); - - $article = new Article( $workflow->getArticleTitle(), 0 ); - - $isNew = $workflow->isNew(); - // Is this making unnecesary db round trips? - if ( !$isNew ) { - $controller->ensureFlowRevision( $article ); - } - - /** @var AbstractBlock $block */ - foreach ( $blocks as $block ) { - $block->init( $action, $user ); - } - $result = $this->getResult(); - - $blocksToCommit = $loader->handleSubmit( $action, $blocks, $user, $this->getModifiedRequest() ); - if ( count( $blocksToCommit ) ) { - $commitResults = $loader->commit( $workflow, $blocksToCommit ); - $savedBlocks = array(); - $result->setIndexedTagName( $savedBlocks, 'block' ); - - foreach( $blocksToCommit as $block ) { - $savedBlocks[] = $block->getName(); - } - - $output[$action] = array( - 'result' => array(), - 'status' => 'ok', - ); - - foreach( $commitResults as $key => $value ) { - $output[$action]['result'][$key] = $this->processCommitResult( $value, $this->doRender() ); - } - if ( $isNew && !$workflow->isNew() ) { - // Workflow was just created, ensure its underlying page is owned by flow - $controller->ensureFlowRevision( $article ); - } - } else { - $output[$action] = array( - 'status' => 'error', - 'result' => array(), - ); - - foreach( $blocks as $block ) { - if ( $block->hasErrors() ) { - $errors = $block->getErrors(); - $nativeErrors = array(); - - foreach( $errors as $key ) { - $nativeErrors[$key]['message'] = $block->getErrorMessage( $key )->parse(); - $nativeErrors[$key]['extra'] = $block->getErrorExtra( $key ); - } - - $output[$action]['result'][$block->getName()] = $nativeErrors; - } - } - } - - $this->getResult()->addValue( null, $this->apiFlow->getModuleName(), $output ); - } - - protected function processCommitResult( $result, $render = true ) { - $output = array(); - foreach( $result as $key => $value ) { - if ( $value instanceof UUID ) { - $output[$key] = $value->getAlphadecimal(); - } else { - $output[$key] = $value; - } - } - - return $output; - } - - public function mustBePosted() { - return true; - } - - public function isWriteMode() { - return true; - } - -======= ->>>>>>> BRANCH (28a0b8 Merge "(bug 61939) Topic-titles not displaying in some topic) public function getHelpUrls() { return array( 'https://www.mediawiki.org/wiki/Extension:Flow/API#' . $this->getAction(), -- To view, visit https://gerrit.wikimedia.org/r/138629 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I60b5628f2872042ca48977be2f604eb4dd1712be Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: frontend-rewrite Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits