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

Remove custom Twig filters and tests in favor of legacy ones

Browse Source
This commit is contained in:
Romain Neutron
2012-09-28 11:40:26 +02:00
parent c2239f5259
commit 23b842d4ca
5 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Application.php
View File

@@ -327,23 +327,15 @@ class Application extends SilexApplication
$twig->addExtension(new \Twig_Extensions_Extension_Text()); $twig->addExtension(new \Twig_Extensions_Extension_Text());
$twig->addExtension(new \Alchemy\Phrasea\Twig\JSUniqueID()); $twig->addExtension(new \Alchemy\Phrasea\Twig\JSUniqueID());
include_once __DIR__ . '/Twig/Functions.inc.php';
$twig->addTest('null', new \Twig_Test_Function('is_null'));
$twig->addTest('loopable', new \Twig_Test_Function('is_loopable'));
$twig->addFilter('serialize', new \Twig_Filter_Function('serialize')); $twig->addFilter('serialize', new \Twig_Filter_Function('serialize'));
$twig->addFilter('stristr', new \Twig_Filter_Function('stristr')); $twig->addFilter('stristr', new \Twig_Filter_Function('stristr'));
$twig->addFilter('implode', new \Twig_Filter_Function('implode'));
$twig->addFilter('get_class', new \Twig_Filter_Function('get_class')); $twig->addFilter('get_class', new \Twig_Filter_Function('get_class'));
$twig->addFilter('stripdoublequotes', new \Twig_Filter_Function('stripdoublequotes')); $twig->addFilter('stripdoublequotes', new \Twig_Filter_Function('stripdoublequotes'));
$twig->addFilter('get_collection_logo', new \Twig_Filter_Function('collection::getLogo')); $twig->addFilter('get_collection_logo', new \Twig_Filter_Function('collection::getLogo'));
$twig->addFilter('floor', new \Twig_Filter_Function('floor')); $twig->addFilter('floor', new \Twig_Filter_Function('floor'));
$twig->addFilter('bas_names', new \Twig_Filter_Function('phrasea::bas_names')); $twig->addFilter('bas_names', new \Twig_Filter_Function('phrasea::bas_names'));
$twig->addFilter('sbas_names', new \Twig_Filter_Function('phrasea::sbas_names')); $twig->addFilter('sbas_names', new \Twig_Filter_Function('phrasea::sbas_names'));
$twig->addFilter('urlencode', new \Twig_Filter_Function('urlencode'));
$twig->addFilter('key_exists', new \Twig_Filter_Function('array_key_exists')); $twig->addFilter('key_exists', new \Twig_Filter_Function('array_key_exists'));
$twig->addFilter('array_keys', new \Twig_Filter_Function('array_keys'));
$twig->addFilter('round', new \Twig_Filter_Function('round')); $twig->addFilter('round', new \Twig_Filter_Function('round'));
$twig->addFilter('formatOctets', new \Twig_Filter_Function('p4string::format_octets')); $twig->addFilter('formatOctets', new \Twig_Filter_Function('p4string::format_octets'));
$twig->addFilter('base_from_coll', new \Twig_Filter_Function('phrasea::baseFromColl')); $twig->addFilter('base_from_coll', new \Twig_Filter_Function('phrasea::baseFromColl'));

6
lib/Alchemy/Phrasea/Twig/Functions.inc.php
View File

@@ -1,6 +0,0 @@
<?php
function is_loopable($item)
{
return is_array($item) || $item instanceof Traversable;
}

6
templates/web/admin/setup.html.twig
View File

@@ -74,7 +74,7 @@
<textarea {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}">{{ currentValue }}</textarea> <textarea {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}">{{ currentValue }}</textarea>
{% elseif value['type'] == 'enum' %} {% elseif value['type'] == 'enum' %}
<select {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}"> <select {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}">
{% if value['available'] is defined and value['available'] is loopable %} {% if value['available'] is defined and value['available'] is iterable %}
{% for key, val in value['available'] %} {% for key, val in value['available'] %}
<option value="{{ key }}" {{ currentValue == key ? 'selected="selected"' : '' }} >{{ val }}</option> <option value="{{ key }}" {{ currentValue == key ? 'selected="selected"' : '' }} >{{ val }}</option>
{% endfor %} {% endfor %}
@@ -88,10 +88,10 @@
{% endif %} {% endif %}
</select> </select>
{% elseif value['type'] == 'enum_multi' %} {% elseif value['type'] == 'enum_multi' %}
{% if value['available'] is defined and value['available'] is loopable %} {% if value['available'] is defined and value['available'] is iterable %}
{% for key, availableValue in value['available'] %} {% for key, availableValue in value['available'] %}
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="{{ value['name'] ~ '[]' }}" {{ readonly ? 'readonly="readonly"' : ''}} value="{{ key }}" {{ currentValue is loopable and key in currentValue| keys ? 'checked="checked"' : '' }} /> {{ availableValue }}</label> <input type="checkbox" name="{{ value['name'] ~ '[]' }}" {{ readonly ? 'readonly="readonly"' : ''}} value="{{ key }}" {{ currentValue is iterable and key in currentValue| keys ? 'checked="checked"' : '' }} /> {{ availableValue }}</label>
{% endfor %} {% endfor %}
{% else %} {% else %}
<p class='alert'> <p class='alert'>

16
templates/web/prod/index.html.twig
View File

@@ -367,7 +367,7 @@
<option value=""></option> <option value=""></option>
{% for field_id, field in search_datas['fields'] %} {% for field_id, field in search_datas['fields'] %}
{% if field['type'] == 'date' %} {% if field['type'] == 'date' %}
<option class="field_switch field_{{field['sbas']|implode(' field_')}}" value="{{field_id}}" {% if registry.get('GV_phrasea_sort') == field['fieldname'] %}selected="selected"{% endif %}>{{ field['fieldname'] }}</option> <option class="field_switch field_{{field['sbas']|join(' field_')}}" value="{{field_id}}" {% if registry.get('GV_phrasea_sort') == field['fieldname'] %}selected="selected"{% endif %}>{{ field['fieldname'] }}</option>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</select> </select>
@@ -382,7 +382,7 @@
<option value="phraseanet--all--fields">{% trans 'rechercher dans tous les champs' %}</option> <option value="phraseanet--all--fields">{% trans 'rechercher dans tous les champs' %}</option>
{% for field_id, field in search_datas['fields'] %} {% for field_id, field in search_datas['fields'] %}
{% if field['type'] != 'date' %} {% if field['type'] != 'date' %}
<option class="field_switch field_{{field['sbas']|implode(' field_')}}" value="{{field_id}}">{{field['fieldname']}}</option> <option class="field_switch field_{{field['sbas']|join(' field_')}}" value="{{field_id}}">{{field['fieldname']}}</option>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</select> </select>
@@ -402,8 +402,8 @@
<img src="{{s['imgoff']}}" title="{{s['labeloff']}}" /> <img src="{{s['imgoff']}}" title="{{s['labeloff']}}" />
{% endif %} {% endif %}
<label class="checkbox inline"> <label class="checkbox inline">
<input onchange="checkFilters(true);" class="field_switch field_{{s['sbas']|implode('field_')}}" <input onchange="checkFilters(true);" class="field_switch field_{{s['sbas']|join('field_')}}"
type="checkbox" value="{{s['sbas']|implode(' field_')}}" type="checkbox" value="{{s['sbas']|join(' field_')}}"
n="{{n}}" name="status[{{n}}][off][]" /> n="{{n}}" name="status[{{n}}][off][]" />
{{s['labeloff']}} {{s['labeloff']}}
</label> </label>
@@ -413,8 +413,8 @@
<img src="{{s['imgon']}}" title="{{s['labelon']}}" /> <img src="{{s['imgon']}}" title="{{s['labelon']}}" />
{% endif %} {% endif %}
<label class="checkbox inline"> <label class="checkbox inline">
<input onchange="checkFilters(true);" class="field_switch field_{{s['sbas']|implode('field_')}}" <input onchange="checkFilters(true);" class="field_switch field_{{s['sbas']|join('field_')}}"
type="checkbox" value="{{s['sbas']|implode(' field_')}}" type="checkbox" value="{{s['sbas']|join(' field_')}}"
n="{{n}}" name="status[{{n}}][on][]"/> n="{{n}}" name="status[{{n}}][on][]"/>
{{s['labelon']}} {{s['labelon']}}
</label> </label>
@@ -437,9 +437,9 @@
<select name="datefield" class="input-medium"> <select name="datefield" class="input-medium">
{% for field_id, field in search_datas['dates'] %} {% for field_id, field in search_datas['dates'] %}
<option onchange="checkFilters(true);" <option onchange="checkFilters(true);"
class="field_switch field_{{field['sbas']|implode(' field_')}}" value="{{ field['fieldname'] }}">{{field['fieldname']}}</option> class="field_switch field_{{field['sbas']|join(' field_')}}" value="{{ field['fieldname'] }}">{{field['fieldname']}}</option>
{% endfor %} {% endfor %}
<option value="{{search_datas['dates']|array_keys|implode('|')}}" selected="selected"> <option value="{{search_datas['dates']|keys|join('|')}}" selected="selected">
{% trans 'rechercher dans tous les champs' %} {% trans 'rechercher dans tous les champs' %}
</option> </option>
</select> </select>

18
templates/web/prod/preview/short_history.html.twig
View File

@@ -22,30 +22,30 @@
{% elseif action == 'edit' %} {% elseif action == 'edit' %}
{% trans 'report::Edition des meta-donnees' %} {% trans 'report::Edition des meta-donnees' %}
{% elseif action == 'collection' %} {% elseif action == 'collection' %}
{% set dest = done['final']|implode(', ') %} {% set dest = done['final']|join(', ') %}
{% set coll_name = dest|bas_names(app) %} {% set coll_name = dest|bas_names(app) %}
{% trans %}report::Changement de collection vers : {{coll_name}}{% endtrans %} {% trans %}report::Changement de collection vers : {{coll_name}}{% endtrans %}
{% elseif action == 'status' %} {% elseif action == 'status' %}
{% trans 'report::Edition des status' %} {% trans 'report::Edition des status' %}
{% elseif action == 'print' %} {% elseif action == 'print' %}
{% set format = done['final']|implode(', ') %} {% set format = done['final']|join(', ') %}
{% trans %}report::Impression des formats : {{format}}{% endtrans %} {% trans %}report::Impression des formats : {{format}}{% endtrans %}
{% elseif action == 'substit' %} {% elseif action == 'substit' %}
{% set dest = done['final']|implode(', ') %} {% set dest = done['final']|join(', ') %}
{% trans %}report::Substitution de {{dest}}{% endtrans %} {% trans %}report::Substitution de {{dest}}{% endtrans %}
{% elseif action == 'publish' %} {% elseif action == 'publish' %}
{% set dest = done['final']|implode(', ') %} {% set dest = done['final']|join(', ') %}
{% trans %}report::Publication de {{dest}}{% endtrans %} {% trans %}report::Publication de {{dest}}{% endtrans %}
{% elseif action == 'download' %} {% elseif action == 'download' %}
{% set dest = done['final']|implode(', ') %} {% set dest = done['final']|join(', ') %}
{% trans %}report::Telechargement de {{dest}}{% endtrans %} {% trans %}report::Telechargement de {{dest}}{% endtrans %}
{% elseif action == 'mail' %} {% elseif action == 'mail' %}
{% set dest = done['comment']|implode(', ') %} {% set dest = done['comment']|join(', ') %}
{% set content = done['final']|implode(', ') %} {% set content = done['final']|join(', ') %}
{% trans %}Envoi par mail a {{dest}} de {{content}}{% endtrans %} {% trans %}Envoi par mail a {{dest}} de {{content}}{% endtrans %}
{% elseif action == 'ftp' %} {% elseif action == 'ftp' %}
{% set dest = done['comment']|implode(', ') %} {% set dest = done['comment']|join(', ') %}
{% set content = done['final']|implode(', ') %} {% set content = done['final']|join(', ') %}
{% trans %}Envoi par ftp a {{dest}} de {{content}}{% endtrans %} {% trans %}Envoi par ftp a {{dest}} de {{content}}{% endtrans %}
{% elseif action == 'delete' %} {% elseif action == 'delete' %}
{% trans 'report::supression du document' %} {% trans 'report::supression du document' %}