Display installation errors on a step page

This commit is contained in:
Dmitriy Simushev 2014-07-23 12:56:38 +00:00
parent c4592d242a
commit 86f8cb5100
2 changed files with 27 additions and 25 deletions

View File

@ -90,8 +90,8 @@ class InstallController extends AbstractController
$installer = $this->getInstaller(); $installer = $this->getInstaller();
if (!$installer->checkRequirements()) { if (!$installer->checkRequirements()) {
return $this->renderError( return $this->renderStep(
'install_err', 'install_step',
array('errors' => $installer->getErrors()) array('errors' => $installer->getErrors())
); );
} }
@ -123,8 +123,8 @@ class InstallController extends AbstractController
$installer = $this->getInstaller(); $installer = $this->getInstaller();
if (!$installer->checkConnection()) { if (!$installer->checkConnection()) {
return $this->renderError( return $this->renderStep(
'install_err', 'install_step',
array('errors' => $installer->getErrors()) array('errors' => $installer->getErrors())
); );
} }
@ -156,8 +156,8 @@ class InstallController extends AbstractController
$installer = $this->getInstaller(); $installer = $this->getInstaller();
if (!$installer->createTables()) { if (!$installer->createTables()) {
return $this->renderError( return $this->renderStep(
'install_err', 'install_step',
array('errors' => $installer->getErrors()) array('errors' => $installer->getErrors())
); );
} }
@ -230,8 +230,8 @@ class InstallController extends AbstractController
$installer = $this->getInstaller(); $installer = $this->getInstaller();
if (!$installer->setPassword($password)) { if (!$installer->setPassword($password)) {
return $this->renderError( return $this->renderStep(
'install_err', 'install_step',
array('errors' => $installer->getErrors()) array('errors' => $installer->getErrors())
); );
} }
@ -265,8 +265,8 @@ class InstallController extends AbstractController
$installer = $this->getInstaller(); $installer = $this->getInstaller();
if (!$installer->importLocales()) { if (!$installer->importLocales()) {
return $this->renderError( return $this->renderStep(
'install_err', 'install_step',
array('errors' => $installer->getErrors()) array('errors' => $installer->getErrors())
); );
} }

View File

@ -27,24 +27,26 @@
{{/each}} {{/each}}
</ul> </ul>
{{#block "nextStep"}} {{#unless errors}}
{{#if nextstep}} {{#block "nextStep"}}
<br/> {{#if nextstep}}
<br/> <br/>
<br/>
{{l10n "Next step:"}} {{l10n "Next step:"}}
<ul> <ul>
<li> <li>
{{#if nextnotice}} {{#if nextnotice}}
{{{nextnotice}}}<br/><br/> {{{nextnotice}}}<br/><br/>
{{/if}} {{/if}}
<a href="{{nextstepurl}}">{{nextstep}}</a> <a href="{{nextstepurl}}">{{nextstep}}</a>
</li> </li>
</ul> </ul>
{{/if}} {{/if}}
{{/block}} {{/block}}
{{/unless}}
</div> </div>
<div class="formbottom"> <div class="formbottom">