Mibew/mibew
1
0
Fork 0
mirror of https://github.com/Mibew/mibew.git synced 2025-02-07 16:24:43 +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();
if (!$installer->checkRequirements()) {
return $this->renderError(
'install_err',
return $this->renderStep(
'install_step',
array('errors' => $installer->getErrors())
);
}
@ -123,8 +123,8 @@ class InstallController extends AbstractController
$installer = $this->getInstaller();
if (!$installer->checkConnection()) {
return $this->renderError(
'install_err',
return $this->renderStep(
'install_step',
array('errors' => $installer->getErrors())
);
}
@ -156,8 +156,8 @@ class InstallController extends AbstractController
$installer = $this->getInstaller();
if (!$installer->createTables()) {
return $this->renderError(
'install_err',
return $this->renderStep(
'install_step',
array('errors' => $installer->getErrors())
);
}
@ -230,8 +230,8 @@ class InstallController extends AbstractController
$installer = $this->getInstaller();
if (!$installer->setPassword($password)) {
return $this->renderError(
'install_err',
return $this->renderStep(
'install_step',
array('errors' => $installer->getErrors())
);
}
@ -265,8 +265,8 @@ class InstallController extends AbstractController
$installer = $this->getInstaller();
if (!$installer->importLocales()) {
return $this->renderError(
'install_err',
return $this->renderStep(
'install_step',
array('errors' => $installer->getErrors())
);
}

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

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