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

PHRAS-524

Browse Source 
close #1378

task subdef
- fix filter on document type
- add filter on multiple databoxes
This commit is contained in:
Jean-Yves Gaulier
2015-05-12 16:05:20 +02:00
committed by Benoît Burnichon
parent 3b1d5aff10
commit a7af07b00c
4 changed files with 140 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
templates/web/admin/task-manager/task-editor/subdefs.html.twig
View File

@@ -4,15 +4,11 @@
<div class="control-group">
<label class="control-label"> {{ 'Databox' | trans }}</label>
<div class="controls">
<select name="sbas">
<option value="">{{ 'All' | trans }}</option>
{% for databox in app['phraseanet.appbox'].get_databoxes() %}
<option value="{{ databox.get_sbas_id() }}">
{{ databox.get_viewname() }}
({{ databox.get_sbas_id() }})
</option>
{% endfor %}
</select>
{% for databox in app['phraseanet.appbox'].get_databoxes() %}
<label class="checkbox inline">
<input type="checkbox" name="sbas[]" value="{{ databox.get_sbas_id() }}"> {{ databox.get_viewname() }}
</label>
{% endfor %}
</div>
</div>
<div class="control-group">
@@ -87,29 +83,31 @@
xml = $.parseXML(xml);
xml = $(xml);
with(document.forms['graphicForm'])
var gform = document.forms['graphicForm'];
gform.embedded.checked = !!parseInt(xml.find("embedded").text());
gform.type_image.checked = !!parseInt(xml.find("type_image").text());
gform.type_video.checked = !!parseInt(xml.find("type_video").text());
gform.type_audio.checked = !!parseInt(xml.find("type_audio").text());
gform.type_document.checked = !!parseInt(xml.find("type_document").text());
gform.type_flash.checked = !!parseInt(xml.find("type_flash").text());
gform.type_unknown.checked = !!parseInt(xml.find("type_unknown").text());
gform.flush.value = minmax(parseInt(xml.find("flush").text()), 1, 100);
gform.maxrecs.value = minmax(parseInt(xml.find("maxrecs").text()), 10, 100);
gform.maxmegs.value = minmax(parseInt(xml.find("maxmegs").text()), 64, 512);
for(i=0; i < gform['sbas[]'].length; i++)
{
embedded.checked = !!parseInt(xml.find("embedded").text());
type_image.checked = !!parseInt(xml.find("type_image").text());
type_video.checked = !!parseInt(xml.find("type_video").text());
type_audio.checked = !!parseInt(xml.find("type_audio").text());
type_document.checked = !!parseInt(xml.find("type_document").text());
type_flash.checked = !!parseInt(xml.find("type_flash").text());
type_unknown.checked = !!parseInt(xml.find("type_unknown").text());
flush.value = minmax(parseInt(xml.find("flush").text()), 1, 100);
maxrecs.value = minmax(parseInt(xml.find("maxrecs").text()), 10, 100);
maxmegs.value = minmax(parseInt(xml.find("maxmegs").text()), 64, 512);
for(i in sbas.options)
var sbid = gform['sbas[]'][i].value;
if(xml.find("sbas").filter(function(){return $(this).text()==sbid}).length > 0)
{
if(sbas.options[i].value == parseInt(xml.find("sbas").text()) )
{
sbas.options[i].selected = true;
}
else
{
sbas.options[i].selected = false;
}
gform['sbas[]'][i].checked = true;
}
else
{
gform['sbas[]'][i].checked = false;
}
}
}
}

16
templates/web/admin/task-manager/task-editor/task.html.twig
View File

@@ -55,16 +55,6 @@
</script>
</div>
<script type="text/javascript">
(function( $ ){
$.fn.serializeJSON=function() {
var json = {};
jQuery.map($(this).serializeArray(), function(n, i){
json[n['name']] = n['value'];
});
return json;
};
})( jQuery );
$(document).ready(function(){
$("#taskTabs").tabs({
@@ -126,10 +116,10 @@
});
function xmlFromForm(callback) {
var data = $("#graphicForm").serializeJSON();
data["xml"] = $("#txtareaxml").val();
var formData = $("#graphicForm").serializeArray();
formData.push({"name":"xml", "value":$("#txtareaxml").val()});
$.ajax({ url: "{{ path('admin_tasks_xml_from_form', {'task' : task.getId()}) }}"
, data: data
, data: formData
, dataType:'text'
, type:"POST"
, success:function(data) {