hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 04:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

2
lib/classes/patch/370a3.class.php
View File

@@ -60,7 +60,7 @@ class patch_370a3 implements patchInterface
} catch (\Exception_NotFound $e) { } catch (\Exception_NotFound $e) {
$client = \API_OAuth2_Application::create($appbox, null, \API_OAuth2_Application_Navigator::CLIENT_NAME); $client = \API_OAuth2_Application::create($appbox, null, \API_OAuth2_Application_Navigator::CLIENT_NAME);
$client->set_activated(true); $client->set_activated(false);
$client->set_grant_password(true); $client->set_grant_password(true);
$client->set_website("http://www.phraseanet.com"); $client->set_website("http://www.phraseanet.com");
$client->set_client_id(\API_OAuth2_Application_Navigator::CLIENT_ID); $client->set_client_id(\API_OAuth2_Application_Navigator::CLIENT_ID);

16
www/admin/databases.php
View File

@@ -71,10 +71,22 @@ phrasea::headers();
<?php echo _('N\'oubliez pas de redemarrer le planificateur de taches'); ?> <?php echo _('N\'oubliez pas de redemarrer le planificateur de taches'); ?>
</div> </div>
<?php <?php
} catch (\Exception $e) { } catch (\Exception_Setup_UpgradeAlreadyStarted $e) {
?> ?>
<div style="margin-top:10px;color:black;font-weight:bold;background-color:yellow;"> <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> </div>
<?php <?php
} }