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

fix PR "notification quarantine"

Browse Source 
fix typo

remove debug message

fix typo
This commit is contained in:
Nicolas Le Goff
2012-06-11 13:40:25 +02:00
parent c8f34f5ebe
commit 02f58b9f57
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Prod/Language.php
View File

@@ -96,7 +96,7 @@ class Language implements ControllerProviderInterface
$out['selectOneRecord'] = _('Please select one record'); $out['selectOneRecord'] = _('Please select one record');
$out['onlyOneRecord'] = _('You can choose only one record'); $out['onlyOneRecord'] = _('You can choose only one record');
$out['errorAjaxRequest'] = _('An error occured, please retry'); $out['errorAjaxRequest'] = _('An error occured, please retry');
$out['filBeingDownloaded'] = _('Some files are being downloaded'); $out['fileBeingDownloaded'] = _('Some files are being downloaded');
$out['warning'] = _('Attention'); $out['warning'] = _('Attention');
$Serializer = $app['Core']['Serializer']; $Serializer = $app['Core']['Serializer'];

2
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
View File

@@ -181,7 +181,7 @@ class Upload implements ControllerProviderInterface
$collection = \collection::get_from_base_id($base_id); $collection = \collection::get_from_base_id($base_id);
$lazaretSession = new \Entities\LazaretSession(); $lazaretSession = new \Entities\LazaretSession();
$lazaretSession->setUsrId($app['Core']->getAuthenticatedUser()->get_id()); $lazaretSession->setUsrId(null);
$app['Core']['EM']->persist($lazaretSession); $app['Core']['EM']->persist($lazaretSession);

2
templates/web/prod/upload/upload.html.twig
View File

@@ -207,7 +207,7 @@ $(document).ready(function () {
//prevent dialog box from being closed while files are being downloaded //prevent dialog box from being closed while files are being downloaded
dialog.getDomElement().bind("dialogbeforeclose", function(event, ui) { dialog.getDomElement().bind("dialogbeforeclose", function(event, ui) {
if ( ! UploaderManager.Queue.isEmpty()) { if ( ! UploaderManager.Queue.isEmpty()) {
p4.Alerts(language.warning, language.filBeingDownloaded); p4.Alerts(language.warning, language.fileBeingDownloaded);
return false; return false;
} }
}); });