From 044ec6f97df64f9261a0db66185f644721747fc8 Mon Sep 17 00:00:00 2001 From: Thomas Mortagne <thomas.mortagne@gmail.com> Date: Wed, 5 Oct 2016 16:02:18 +0200 Subject: [PATCH] XWIKI-13773: Wiki creation should not force deleting the wiki when there is no blocker error --- .../main/resources/WikiManager/CreateWiki.xml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/src/main/resources/WikiManager/CreateWiki.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/src/main/resources/WikiManager/CreateWiki.xml index f97a0bb90b3..e3017ac0b68 100644 --- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/src/main/resources/WikiManager/CreateWiki.xml +++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/src/main/resources/WikiManager/CreateWiki.xml @@ -31,8 +31,8 @@ <parent>WikiManager.WebHome</parent> <author>xwiki:XWiki.Admin</author> <contentAuthor>xwiki:XWiki.Admin</contentAuthor> - <date>1308816032000</date> - <contentUpdateDate>1308816032000</contentUpdateDate> + <date>1475675577000</date> + <contentUpdateDate>1475675577000</contentUpdateDate> <version>1.1</version> <title>$services.localization.render('platform.wiki.create.title')</title> <comment/> @@ -561,8 +561,6 @@ #set ($discard = $xwiki.ssfx.use('uicomponents/logging/logging.css', true)) #set ($discard = $xwiki.jsfx.use('uicomponents/logging/logging.js', true)) #set ($status = $services.wiki.creationjob.getJobStatus($request.wikiname)) - #set ($errors = $status.log.getLogs('ERROR')) - #set ($hasError = ($errors.size() > 0)) {{html}} <form class="xform" method="post" action="$doc.getURL()"> <input type="hidden" name="wikiId" id="wikiId" value="$!escapetool.xml($request.wikiname)" /> @@ -583,10 +581,10 @@ </div> </div> #end - <p class="successmessage box #if($hasError || $state != 'FINISHED')hidden#end" id="successMessage"> + <p class="successmessage box #if($status.error || $state != 'FINISHED')hidden#end" id="successMessage"> $services.localization.render('platform.wiki.create.wizard.step.creation.complete', ["<strong>$escapetool.xml($request.wikiname)</strong>"]) </p> - <p class="errormessage box #if(!$hasError || $state != 'FINISHED')hidden#end" id="errorMessage"> + <p class="errormessage box #if(!$$status.error || $state != 'FINISHED')hidden#end" id="errorMessage"> $services.localization.render('platform.wiki.create.wizard.step.creation.error', ["<strong>$escapetool.xml($request.wikiname)</strong>"]) </p> </div> @@ -602,8 +600,13 @@ </div> #set($doc = $olddoc) #if($status.state == 'FINISHED') - #set($finalizeHidden = $hasError) - #set($cleanUpHidden = !$hasError) + #if ($status.error) + #set($finalizeHidden = true) + #set($cleanUpHidden = false) + #else + #set($finalizeHidden = false) + #set($cleanUpHidden = true) + #end #else #set($finalizeHidden = true) #set($cleanUpHidden = true) -- GitLab