set phraseanet navigator to desactivate state by default, make exception handling nicer

This commit is contained in:
Nicolas Le Goff
2012-04-27 19:01:00 +02:00
parent a4f523113f
commit f0b9fc3f20
2 changed files with 15 additions and 3 deletions

View File

@@ -71,10 +71,22 @@ phrasea::headers();
<?php echo _('N\'oubliez pas de redemarrer le planificateur de taches'); ?>
</div>
<?php
} catch (\Exception $e) {
} catch (\Exception_Setup_UpgradeAlreadyStarted $e) {
?>
<div style="margin-top:10px;color:black;font-weight:bold;background-color:yellow;">
<?php echo $e->getMessage(); ?>
<?php echo _('The upgrade is already started'); ?>
</div>
<?php
}catch(\Exception_Setup_FixBadEmailAddresses $e){
?>
<div style="margin-top:10px;color:black;font-weight:bold;background-color:yellow;">
<?php echo _('Please fix the database before starting'); ?>
</div>
<?php
}catch(\Exception $e){
?>
<div style="margin-top:10px;color:black;font-weight:bold;background-color:yellow;">
<?php echo _('An error occured'); ?>
</div>
<?php
}