mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Merge branch '3.8'
Conflicts: CHANGELOG.md bin/console bin/developer bin/setup bower.json composer.json composer.lock features/bootstrap/FeatureContext.php features/bootstrap/GuiContext.php lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php lib/Alchemy/Phrasea/Command/CreateCollection.php lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php lib/Alchemy/Phrasea/Controller/Admin/Collection.php lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php lib/Alchemy/Phrasea/Controller/Api/V1.php lib/Alchemy/Phrasea/Controller/Client/Baskets.php lib/Alchemy/Phrasea/Controller/Client/Root.php lib/Alchemy/Phrasea/Controller/Prod/Basket.php lib/Alchemy/Phrasea/Controller/Prod/Export.php lib/Alchemy/Phrasea/Controller/Prod/Property.php lib/Alchemy/Phrasea/Controller/Prod/Records.php lib/Alchemy/Phrasea/Controller/Prod/Tools.php lib/Alchemy/Phrasea/Controller/Prod/Upload.php lib/Alchemy/Phrasea/Controller/Root/Login.php lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php lib/Alchemy/Phrasea/Core/Version.php lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php lib/Alchemy/Phrasea/Helper/DatabaseHelper.php lib/Alchemy/Phrasea/Helper/User/Edit.php lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php lib/Doctrine/Entities/AuthFailure.php lib/Doctrine/Entities/Basket.php lib/Doctrine/Entities/BasketElement.php lib/Doctrine/Entities/LazaretAttribute.php lib/Doctrine/Entities/LazaretCheck.php lib/Doctrine/Entities/LazaretFile.php lib/Doctrine/Entities/LazaretSession.php lib/Doctrine/Entities/Session.php lib/Doctrine/Entities/SessionModule.php lib/Doctrine/Entities/StoryWZ.php lib/Doctrine/Entities/UsrList.php lib/Doctrine/Entities/UsrListEntry.php lib/Doctrine/Entities/UsrListOwner.php lib/Doctrine/Entities/ValidationData.php lib/Doctrine/Entities/ValidationParticipant.php lib/Doctrine/Entities/ValidationSession.php lib/Doctrine/Logger/MonologSQLLogger.php lib/Doctrine/Repositories/BasketRepository.php lib/Doctrine/Repositories/ValidationParticipantRepository.php lib/Doctrine/Types/Binary.php lib/Doctrine/Types/Blob.php lib/Doctrine/Types/Enum.php lib/Doctrine/Types/LongBlob.php lib/Doctrine/Types/VarBinary.php lib/classes/API/OAuth2/Account.php lib/classes/API/OAuth2/Application.php lib/classes/API/OAuth2/Application/OfficePlugin.php lib/classes/API/OAuth2/AuthCode.php lib/classes/API/OAuth2/RefreshToken.php lib/classes/API/OAuth2/Token.php lib/classes/API/V1/Abstract.php lib/classes/API/V1/Interface.php lib/classes/API/V1/adapter.php lib/classes/API/V1/exception/abstract.php lib/classes/API/V1/exception/badrequest.php lib/classes/API/V1/exception/forbidden.php lib/classes/API/V1/exception/internalservererror.php lib/classes/API/V1/exception/maintenance.php lib/classes/API/V1/exception/methodnotallowed.php lib/classes/API/V1/exception/notfound.php lib/classes/API/V1/exception/unauthorized.php lib/classes/API/V1/result.php lib/classes/Exception/Feed/EntryNotFound.php lib/classes/Exception/Feed/ItemNotFound.php lib/classes/Exception/Feed/PublisherNotFound.php lib/classes/Feed/Abstract.php lib/classes/Feed/Adapter.php lib/classes/Feed/Aggregate.php lib/classes/Feed/Collection.php lib/classes/Feed/CollectionInterface.php lib/classes/Feed/Entry/Adapter.php lib/classes/Feed/Entry/Collection.php lib/classes/Feed/Entry/CollectionInterface.php lib/classes/Feed/Entry/Interface.php lib/classes/Feed/Entry/Item.php lib/classes/Feed/Entry/ItemInterface.php lib/classes/Feed/Interface.php lib/classes/Feed/Link.php lib/classes/Feed/LinkInterface.php lib/classes/Feed/Publisher/Adapter.php lib/classes/Feed/Publisher/Interface.php lib/classes/Feed/Token.php lib/classes/Feed/TokenAggregate.php lib/classes/Feed/XML/Abstract.php lib/classes/Feed/XML/Atom.php lib/classes/Feed/XML/Cooliris.php lib/classes/Feed/XML/Interface.php lib/classes/Feed/XML/RSS.php lib/classes/Feed/XML/RSS/Image.php lib/classes/Feed/XML/RSS/ImageInterface.php lib/classes/User/Adapter.php lib/classes/User/Interface.php lib/classes/appbox/register.php lib/classes/connection.php lib/classes/connection/abstract.php lib/classes/connection/interface.php lib/classes/connection/pdo.php lib/classes/connection/pdoStatementDebugger.php lib/classes/deprecated/countries.php lib/classes/deprecated/inscript.api.php lib/classes/eventsmanager/event/test.php lib/classes/ftpclient.php lib/classes/http/request.php lib/classes/media/subdef.php lib/classes/module/console/schedulerStart.php lib/classes/module/console/schedulerState.php lib/classes/module/console/schedulerStop.php lib/classes/module/console/taskState.php lib/classes/module/console/tasklist.php lib/classes/module/console/taskrun.php lib/classes/patch/320alpha4b.php lib/classes/patch/3715alpha1a.php lib/classes/patch/379alpha1a.php lib/classes/patch/380alpha10a.php lib/classes/patch/380alpha11a.php lib/classes/patch/380alpha13a.php lib/classes/patch/380alpha14a.php lib/classes/patch/380alpha15a.php lib/classes/patch/380alpha16a.php lib/classes/patch/380alpha17a.php lib/classes/patch/380alpha18a.php lib/classes/patch/380alpha3a.php lib/classes/patch/380alpha4a.php lib/classes/patch/380alpha6a.php lib/classes/patch/380alpha8a.php lib/classes/patch/380alpha9a.php lib/classes/patch/381alpha1b.php lib/classes/patch/381alpha2a.php lib/classes/patch/381alpha3a.php lib/classes/patch/381alpha4a.php lib/classes/patch/383alpha1a.php lib/classes/patch/383alpha2a.php lib/classes/patch/383alpha3a.php lib/classes/patch/383alpha4a.php lib/classes/record/adapter.php lib/classes/record/preview.php lib/classes/recordutils.php lib/classes/recordutils/audio.php lib/classes/recordutils/document.php lib/classes/recordutils/map.php lib/classes/recordutils/video.php lib/classes/registry.php lib/classes/registryInterface.php lib/classes/set/order.php lib/classes/system/url.php lib/classes/task/Scheduler.php lib/classes/task/appboxAbstract.php lib/classes/task/databoxAbstract.php lib/classes/task/manager.php lib/classes/task/period/RecordMover.php lib/classes/task/period/apibridge.php lib/classes/task/period/apiwebhooks.php lib/classes/task/period/archive.php lib/classes/task/period/cindexer.php lib/classes/task/period/emptyColl.php lib/classes/task/period/ftp.php lib/classes/task/period/ftpPull.php lib/classes/task/period/subdef.php lib/classes/task/period/test.php lib/classes/task/period/writemeta.php lib/conf.d/PhraseaFixture/AbstractWZ.php lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php lib/conf.d/PhraseaFixture/Story/LoadOneStory.php lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php lib/conf.d/PhraseaFixture/UsrLists/UsrList.php lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php templates/web/admin/collection/collection.html.twig templates/web/common/dialog_export.html.twig templates/web/common/menubar.html.twig templates/web/prod/actions/Tools/index.html.twig templates/web/prod/index.html.twig templates/web/prod/upload/upload-flash.html.twig templates/web/prod/upload/upload.html.twig templates/web/report/report_layout_child.html.twig templates/web/setup/step2.html.twig templates/web/thesaurus/new-synonym-dialog.html.twig templates/web/thesaurus/properties.html.twig templates/web/thesaurus/search.html.twig tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
This commit is contained in:
Nicolas Le Goff
@@ -2,61 +2,63 @@
|
||||
|
||||
{% macro print_ftp_form(datas) %}
|
||||
<div class="ftp_form ftp_form_{{datas.usr_id}}">
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-address-{{datas.usr_id}}">{{ 'phraseanet:: adresse' | trans }} ftp://</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="address" id="ftp-address-{{datas.usr_id}}" value="{{datas.address}}" />
|
||||
<form id="ftp_user_{{datas.usr_id}}" action="{{ path('export_ftp') }}" method="post" target="_blank" class="form-horizontal" style="text-align: left;">
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-address-{{datas.usr_id}}">{{ 'phraseanet:: adresse' | trans }} ftp://</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="address" id="ftp-address-{{datas.usr_id}}" value="{{datas.address}}" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-ssl-{{datas.usr_id}}">{{ 'phraseanet:: utiliser SSL' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="checkbox" name="ssl" id="ftp-ssl-{{datas.usr_id}}" {% if datas.ssl %}checked{% endif %} />
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-ssl-{{datas.usr_id}}">{{ 'phraseanet:: utiliser SSL' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="checkbox" name="ssl" id="ftp-ssl-{{datas.usr_id}}" {% if datas.ssl %}checked{% endif %} />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-login-{{datas.usr_id}}">{{ 'admin::compte-utilisateur identifiant' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="login" id="ftp-login-{{datas.usr_id}}" value="{{datas.login}}" />
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-login-{{datas.usr_id}}">{{ 'admin::compte-utilisateur identifiant' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="login" id="ftp-login-{{datas.usr_id}}" value="{{datas.login}}" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-password-{{datas.usr_id}}">{{ 'admin::compte-utilisateur mot de passe' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="password" name="password" id="ftp-password-{{datas.usr_id}}" value="{{datas.password}}" />
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-password-{{datas.usr_id}}">{{ 'admin::compte-utilisateur mot de passe' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="password" name="password" id="ftp-password-{{datas.usr_id}}" value="{{datas.password}}" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-passive-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: Utiliser le mode passif' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input value="1" type="checkbox" name="passive" id="ftp-passive-{{datas.usr_id}}" {% if datas.passive %}checked{% endif %} />
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-passive-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: Utiliser le mode passif' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input value="1" type="checkbox" name="passive" id="ftp-passive-{{datas.usr_id}}" {% if datas.passive %}checked{% endif %} />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-max-retry-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: Nombre d\'essais max' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="max_retry" id="ftp-max-retry-{{datas.usr_id}}" value="{{datas.max_retry}}" />
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-max-retry-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: Nombre d\'essais max' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="max_retry" id="ftp-max-retry-{{datas.usr_id}}" value="{{datas.max_retry}}" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-dest-folder-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: repertoire de destination ftp' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="dest_folder" id="ftp-dest-folder-{{datas.usr_id}}" value="{{datas.dest_folder}}" />
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-dest-folder-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: repertoire de destination ftp' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="dest_folder" id="ftp-dest-folder-{{datas.usr_id}}" value="{{datas.dest_folder}}" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-prefix-folder-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: creer un dossier' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="checkbox" class="ftp_folder_check" {% if datas.prefix_folder != '' %}checked{% endif %} name="prefix_folder_check" id="ftp-prefix-folder-check-{{datas.usr_id}}" />
|
||||
<input type="text" name="prefix_folder" id="ftp-prefix-folder-{{datas.usr_id}}" value="{{datas.prefix_folder}}" {% if datas.prefix_folder == '' %}disabled{% endif %} />
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp-prefix-folder-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: creer un dossier' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="checkbox" class="ftp_folder_check" {% if datas.prefix_folder != '' %}checked{% endif %} name="prefix_folder_check" id="ftp-prefix-folder-check-{{datas.usr_id}}" />
|
||||
<input type="text" name="prefix_folder" id="ftp-prefix-folder-{{datas.usr_id}}" value="{{datas.prefix_folder}}" {% if datas.prefix_folder == '' %}disabled{% endif %} />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="logfile_{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: ecrire un fichier de log' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="checkbox" class=ftp_logfile_check" name="logfile" id="logfile_{{datas.usr_id}}" value="1" />
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="logfile_{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: ecrire un fichier de log' | trans }}</label>
|
||||
<div class="controls">
|
||||
<input type="checkbox" class=ftp_logfile_check" name="logfile" id="logfile_{{datas.usr_id}}" value="1" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
@@ -409,30 +411,30 @@
|
||||
<div id="ftp">
|
||||
<div style="padding:10px; text-align: center;">
|
||||
<h4>{{ 'export:: FTP' | trans }}</h4>
|
||||
<form action="{{ path('export_ftp') }}" method="post" target="_blank" class="form-horizontal" style="text-align: left;">
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp_form_selector">
|
||||
{{ 'phraseanet:: prereglages' | trans }}
|
||||
</label>
|
||||
<div class="controls">
|
||||
<select id="ftp_form_selector" class="span3">
|
||||
{% for datas in download.get_ftp_datas() %}
|
||||
<option value="{{datas.usr_id}}">{{datas.name}}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div id="ftp_form">
|
||||
<div id="ftp_form_stock">
|
||||
{% for datas in download.get_ftp_datas() %}
|
||||
{{ _self.print_ftp_form(datas) }}
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
<form id="ftp_joined" class="form-horizontal" style="text-align: left;">
|
||||
<input type="hidden" name="lst" value="{{lst}}"/>
|
||||
<input type="hidden" name="ssttid" value="{{ssttid}}"/>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="ftp_form_selector">
|
||||
{{ 'phraseanet:: prereglages' | trans }}
|
||||
</label>
|
||||
<div class="controls">
|
||||
<select id="ftp_form_selector" class="span3">
|
||||
{% for datas in download.get_ftp_datas() %}
|
||||
<option value="{{datas.usr_id}}">{{datas.name}}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div id="ftp_form">
|
||||
<div id="ftp_form_stock">
|
||||
{% for datas in download.get_ftp_datas() %}
|
||||
{{ _self.print_ftp_form(datas) }}
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<p>{{ 'export::mail: fichiers joint' | trans }}</p>
|
||||
<p>{% trans 'export::mail: fichiers joint' %}</p>
|
||||
{% for name, values in download.get_display_ftp() %}
|
||||
{% if values.available > 0 %}
|
||||
<div class="well-small">
|
||||
@@ -477,14 +479,14 @@
|
||||
</label>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="buttons_line">
|
||||
<button type="button" class="tryftp_button btn btn-inverse">{{ 'boutton::essayer' | trans }}</button>
|
||||
<img class="tryftp_button_loader" src="/skins/icons/loader404040.gif" style="visibility:hidden;margin:0 5px;"/>
|
||||
<button type="button" class="ftp_button btn btn-inverse">{{ 'boutton::envoyer' | trans }}</button>
|
||||
<img class="ftp_button_loader" src="/skins/icons/loader404040.gif" style="visibility:hidden;margin:0 5px;"/>
|
||||
<button type="button" class="close_button btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
|
||||
</div>
|
||||
</form>
|
||||
<div class="buttons_line">
|
||||
<button type="button" class="tryftp_button btn btn-inverse">{{ 'boutton::essayer' | trans }}</button>
|
||||
<img class="tryftp_button_loader" src="/skins/icons/loader404040.gif" style="visibility:hidden;margin:0 5px;"/>
|
||||
<button type="button" class="ftp_button btn btn-inverse">{{ 'boutton::envoyer' | trans }}</button>
|
||||
<img class="ftp_button_loader" src="/skins/icons/loader404040.gif" style="visibility:hidden;margin:0 5px;"/>
|
||||
<button type="button" class="close_button btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){
|
||||
@@ -726,18 +728,21 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
$('#ftp .ftp_button_loader').css('visibility','visible');
|
||||
$('#ftp .ftp_button_loader').show();
|
||||
|
||||
$('#ftp .ftp_form:hidden').remove();
|
||||
|
||||
var $this = $(this);
|
||||
var options = $('#ftp form').serialize();
|
||||
|
||||
var options_addr = $('#ftp_form_stock form:visible').serialize();
|
||||
var options_join = $('#ftp_joined').serialize();
|
||||
|
||||
$this.attr('disabled','disabled');
|
||||
$.post("../prod/export/ftp/"
|
||||
, options
|
||||
, options_addr + '&' + options_join
|
||||
, function(data){
|
||||
$this.removeAttr('disabled');
|
||||
$('#ftp .ftp_button_loader').css('visibility','hidden');
|
||||
$('#ftp .ftp_button_loader').hide();
|
||||
|
||||
if(data.success) {
|
||||
humane.info(data.message);
|
||||
@@ -762,9 +767,10 @@
|
||||
$('#ftp .tryftp_button_loader').css('visibility','visible');
|
||||
var $this = $(this);
|
||||
$this.attr('disabled','disabled');
|
||||
var options = $('#ftp form').serialize();
|
||||
var options_addr = $('#ftp_form_stock form:visible').serialize();
|
||||
|
||||
$.post("../prod/export/ftp/test/"
|
||||
, options
|
||||
, options_addr // no need to include 'ftp_joined' checkboxes to test ftp
|
||||
, function(data){
|
||||
$('#ftp .tryftp_button_loader').css('visibility','hidden');
|
||||
|
||||
@@ -774,7 +780,7 @@
|
||||
title : data.success ? '{{ "Success" | trans | e('js') }}' : '{{ "Warning !" | trans | e('js') }}'
|
||||
};
|
||||
|
||||
p4.Dialog.Create(options, 2).setContent(data.message);
|
||||
p4.Dialog.Create(options, 3).setContent(data.message);
|
||||
|
||||
$this.removeAttr('disabled');
|
||||
|
||||
|
||||
@@ -8,29 +8,11 @@
|
||||
</li>
|
||||
{% if module is defined and module != "lightbox" and app['authentication'].isAuthenticated() %}
|
||||
<li>
|
||||
{% if module is defined and module == "prod" %}
|
||||
<a target="_self" href="{{ path('get_client') }}">
|
||||
<a target="_blank" href="{{ path('prod') }}">
|
||||
<span class="">
|
||||
{{ 'admin::monitor: Ancienne version (client)' | trans }}
|
||||
{{ 'admin::monitor: production' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
{% else %}
|
||||
{% if app['browser'].isNewGeneration %}
|
||||
{% if module is defined and module == "client" %}
|
||||
<a target="_self" href="{{ path('prod') }}">
|
||||
<span class="">
|
||||
{{ 'admin::monitor: Nouvelle version (prod)' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
{% else %}
|
||||
<a target="_blank" href="{{ path('prod') }}">
|
||||
<span class="">
|
||||
{{ 'admin::monitor: production' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</li>
|
||||
|
||||
{% if app['browser'].isNewGeneration and app['conf'].get(['registry', 'modules', 'thesaurus']) == true and app['acl'].get(app['authentication'].getUser()).has_access_to_module('thesaurus') %}
|
||||
@@ -79,7 +61,7 @@
|
||||
{% if module is defined and module == "prod" %}
|
||||
{% if app['acl'].get(app['authentication'].getUser()).has_access_to_module('upload') %}
|
||||
<li>
|
||||
{% set link = path('upload_form') %}
|
||||
{% set link = path('upload_html5_form') %}
|
||||
|
||||
{% if not app['browser'].supportFileAPI() %}
|
||||
{% set link = path('upload_flash_form') %}
|
||||
@@ -95,7 +77,7 @@
|
||||
{% endif %}
|
||||
|
||||
{# MODULE #}
|
||||
{% if module is defined and (module == "prod" or module == "client") %}
|
||||
{% if module == "prod" %}
|
||||
<li>
|
||||
<a href="#" onclick="getHome('PUBLI');" >
|
||||
<span>
|
||||
@@ -122,7 +104,7 @@
|
||||
<div class="PNB" style="left:auto;overflow:hidden;">
|
||||
<ol>
|
||||
|
||||
{% if app['authentication'].isAuthenticated() and (module is defined and (module == "client" or module == "prod")) %}
|
||||
{% if app['authentication'].isAuthenticated() and module == "prod" %}
|
||||
<li id="notification_trigger">
|
||||
<a href="#" style="font-weight:bold;text-decoration:none;">
|
||||
<span>
|
||||
@@ -192,7 +174,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if app['authentication'].isAuthenticated() and (module is defined and (module == "client" or module == "prod")) %}
|
||||
{% if app['authentication'].isAuthenticated() and (module == "client" or module == "prod") %}
|
||||
<div style="display:none;z-index:30000;" id="notification_box">
|
||||
{% set notifications = app['events-manager'].get_notifications %}
|
||||
{% include 'prod/notifications.html.twig' %}
|
||||
|
||||
Reference in New Issue
Block a user