XWIKI-13773: Wiki creation should not force deleting the wiki when there is no blocker error

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() &gt; 0))
   {{html}}
     &lt;form class="xform" method="post" action="$doc.getURL()"&gt;
     &lt;input type="hidden" name="wikiId" id="wikiId" value="$!escapetool.xml($request.wikiname)" /&gt;
@@ -583,10 +581,10 @@
         &lt;/div&gt;
       &lt;/div&gt;
       #end
-      &lt;p class="successmessage box #if($hasError || $state != 'FINISHED')hidden#end" id="successMessage"&gt;
+      &lt;p class="successmessage box #if($status.error || $state != 'FINISHED')hidden#end" id="successMessage"&gt;
         $services.localization.render('platform.wiki.create.wizard.step.creation.complete', ["&lt;strong&gt;$escapetool.xml($request.wikiname)&lt;/strong&gt;"])
       &lt;/p&gt;
-      &lt;p class="errormessage box #if(!$hasError || $state != 'FINISHED')hidden#end" id="errorMessage"&gt;
+      &lt;p class="errormessage box #if(!$$status.error || $state != 'FINISHED')hidden#end" id="errorMessage"&gt;
         $services.localization.render('platform.wiki.create.wizard.step.creation.error', ["&lt;strong&gt;$escapetool.xml($request.wikiname)&lt;/strong&gt;"])
       &lt;/p&gt;
     &lt;/div&gt;
@@ -602,8 +600,13 @@
     &lt;/div&gt;
     #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)