Mibew/mibew
1
0
Fork 0
mirror of https://github.com/Mibew/mibew.git synced 2025-02-14 19:35:46 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Display installation errors on a step page

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mibew/libs/classes/Mibew/Controller/InstallController.php
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())
); );
} }

2
src/mibew/styles/pages/default/templates_src/server_side/install_step.handlebars
View File

@ -27,6 +27,7 @@
{{/each}} {{/each}}
</ul> </ul>
{{#unless errors}}
{{#block "nextStep"}} {{#block "nextStep"}}
{{#if nextstep}} {{#if nextstep}}
<br/> <br/>
@ -45,6 +46,7 @@
</ul> </ul>
{{/if}} {{/if}}
{{/block}} {{/block}}
{{/unless}}
</div> </div>
<div class="formbottom"> <div class="formbottom">