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

Merge pull request #1114 from nlegoff/fix-some384

Browse Source 
[3.8.4] Fix some issues
This commit is contained in:
Nicolas Le Goff
2014-06-25 14:31:18 +02:00
parent a87c5bb8e4 caeb383661
commit 48ca2c517e
10 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Alchemy/Phrasea/Controller/Api/V1.php
View File

@@ -146,6 +146,9 @@ class V1 implements ControllerProviderInterface
* Log occurs in after filter
*/
$controllers->after(function (Request $request, Response $response) use ($app, $parseRoute) {
if (false !== stripos($request->headers->get('user-agent', ''), 'Phraseanet SDK Player')) {
return;
}
$account = $app['token']->get_account();
$pathInfo = $request->getPathInfo();
$route = $parseRoute($pathInfo, $response);

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

@@ -217,7 +217,7 @@ class Push implements ControllerProviderInterface
'ssel_id' => $Basket->getId(),
);
if (!$app['phraseanet.registry']->get('GV_force_push_authentication') || !$request->get('force_authentication')) {
if (!$app['phraseanet.registry']->get('GV_enable_push_authentication') || !$request->get('force_authentication')) {
$arguments['LOG'] = $app['tokens']->getUrlToken(
\random::TYPE_VIEW,
$user_receiver->get_id(),

9
lib/conf.d/_GV_template.inc
View File

@@ -267,11 +267,18 @@ return call_user_func_array(function(Application $app) {
'vars' => array(
array(
'type' => \registry::TYPE_BOOLEAN,
'name' => 'GV_force_push_authentication',
'name' => 'GV_enable_push_authentication',
'comment' => _('Enable Forcing authentication to see push content'),
'help' => _('Adds an option to the push form submission to restrict push recipient(s) to Phraseanet users only.'),
'default' => false
),
array(
'type' => \registry::TYPE_BOOLEAN,
'name' => 'GV_force_push_authentication',
'comment' => _('Set force authentication option to see push content as mandatory'),
'help' => _('Disallow the possibility for the end user to disable push authentication'),
'default' => false
),
array(
'type' => \registry::TYPE_STRING,
'name' => 'GV_adminMail',

BIN
locale/en_GB/LC_MESSAGES/phraseanet.mo
View File

Binary file not shown.

5
locale/en_GB/LC_MESSAGES/phraseanet.po
View File

@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-14 14:10+0100\n"
"PO-Revision-Date: 2014-06-04 17:03+0100\n"
"PO-Revision-Date: 2014-06-25 12:08+0100\n"
"Last-Translator: Anthony <acabot@alchemy.fr>\n"
"Language-Team: \n"
"Language: en_GB\n"
@@ -11501,6 +11501,9 @@ msgstr "Unable to create template, its given name is already used."
msgid "Unable to create the user."
msgstr "Unable to create the user."
msgid "Set force authentication option to see push content as mandatory"
msgstr "Set 'force authentication option' for push as mandatory"
#~ msgid "Enable H264 stream mode"
#~ msgstr "Enable H264 stream mode"

BIN
locale/fr_FR/LC_MESSAGES/phraseanet.mo
View File

Binary file not shown.

5
locale/fr_FR/LC_MESSAGES/phraseanet.po
View File

@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-14 14:10+0100\n"
"PO-Revision-Date: 2014-06-04 17:02+0100\n"
"PO-Revision-Date: 2014-06-25 12:07+0100\n"
"Last-Translator: Anthony <acabot@alchemy.fr>\n"
"Language-Team: \n"
"Language: fr_FR\n"
@@ -11678,6 +11678,9 @@ msgstr "Impossible le créer ce modèle, le nom donné est déjà utilisé."
msgid "Unable to create the user."
msgstr "Impossible de créer cet utilisateur."
msgid "Set force authentication option to see push content as mandatory"
msgstr "Rendre obligatoire l'option d'authentification forcée"
#~ msgid "Enable H264 stream mode"
#~ msgstr "Activer H264 en mode flux continu (lecture en streaming)"

5
templates/web/prod/actions/Download/prepare.html.twig
View File

@@ -94,9 +94,10 @@
<div style="display:none">
<form name="download" action="{{ path('document_download', {'token': token}) }}" method="post" target="file_frame">
{% if anonymous %}
<input type="hidden" name="type" value="{{ type }}" />
{% if anonymous %}
<input type="hidden" name="anonymous" value="1" />
{% endif%}
{% endif%}
</form>
<iframe name="file_frame"></iframe>
</div>

7
templates/web/prod/templates/push.html.twig
View File

@@ -154,10 +154,11 @@
{% trans %}Accuse de reception{% endtrans %}
</label>
</div>
{% if app['phraseanet.registry'].get('GV_force_push_authentication') %}
{% if app['phraseanet.registry'].get('GV_enable_push_authentication') %}
{% set force = app['phraseanet.registry'].get('GV_force_push_authentication', false)%}
<div class="control-group">
<label for="PushForceAuthentication" class="checkbox">
<input id="PushForceAuthentication" type="checkbox" checked="checked" name="force_authentication" value="1"/>
<label for="PushForceAuthentication" class="checkbox" {% if force %}style="color:#8a8a8a"{% endif %}>
<input {% if force %}disabled="disabled"{% endif %} id="PushForceAuthentication" type="checkbox" checked="checked" name="force_authentication" value="1"/>
{% trans %}Force authentication{% endtrans %}
</label>
</div>

6
www/skins/prod/jquery.main-prod.js
View File

@@ -398,7 +398,11 @@ function afterSearch() {
delay: 0
});
$('.previewTips').tooltip({
fixable: true
fixable: true,
delay: 200,
top: 15,
left: 15,
outside: false
});
$('.thumb .rollovable').hover(
function () {