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 branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Databox.php
	lib/classes/collection.php
	templates/web/admin/databox/databox.html.twig
This commit is contained in:
Nicolas Le Goff
2014-01-14 12:38:58 +01:00
parent 76db61aaee d5222ee72c
commit 45679d8675
3 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/admin/databox/databox.html.twig
View File

@@ -177,7 +177,7 @@
{% for collId, name in databox.get_mountable_colls() %}
<li>
<form class="form-inline" method="post" action="{{ path('admin_database_mount_collection', {'databox_id': databox.get_sbas_id(), 'collection_id' : collId }) }}">
{{ "Monter" | trans }} {{ name }}
{% trans %}Monter la collection {{ name }}{% endtrans %}<br/>
{% if app['acl'].get(app['authentication'].getUser()).get_granted_base(["canadmin"]) | length > 0 %}
<label for="othcollsel">{{ "admin::base:collection: Vous pouvez choisir une collection de reference pour donenr des acces" | trans }}</label>
<select id="othcollsel" name="othcollsel" >