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

PHRAS-211 #fix status not applied

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-07-23 15:31:41 +02:00
parent 2dc08a5329
commit 94e502c12b
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/client/answers.html.twig
View File

@@ -144,7 +144,7 @@
{% else %} {% else %}
<td class="w160px"> <td class="w160px">
{% endif %} {% endif %}
<div class="diapo w160px" style="margin-bottom:0;border-bottom:none;overflow:hidden;"> <div class="diapo w160px" style="margin-bottom:0;border-bottom:none;">
<div class="title" style="max-height:100%" title="{{ record.get_title() }}">{{ record.get_title() }}</div> <div class="title" style="max-height:100%" title="{{ record.get_title() }}">{{ record.get_title() }}</div>
<div class="status">{{ record.get_status_icons()|raw }}</div> <div class="status">{{ record.get_status_icons()|raw }}</div>
<table cellpadding="0" cellspacing="0" style="margin: 0pt auto;"> <table cellpadding="0" cellspacing="0" style="margin: 0pt auto;">

2
templates/web/prod/results/record.html.twig
View File

@@ -21,7 +21,7 @@
onDblClick="openPreview('RESULT',{{record.get_number}});"> onDblClick="openPreview('RESULT',{{record.get_number}});">
{% endif %} {% endif %}
<div style="padding: 4px;"> <div style="padding: 4px;">
<div style="height:40px; position: relative; z-index: 95;margin-bottom:0;border-bottom:none;overflow:hidden;"> <div style="height:40px; position: relative; z-index: 95;margin-bottom:0;border-bottom:none;">
<div class="title" style="max-height:100%" title="{{ record.get_title() }}"> <div class="title" style="max-height:100%" title="{{ record.get_title() }}">
{{ record.get_title() }} {{ record.get_title() }}
</div> </div>

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

@@ -394,13 +394,19 @@ $(document).ready(function () {
//on submit file //on submit file
$('#fileupload', UploaderManager.getContainer()).bind('fileuploadsubmit', function (e, data) { $('#fileupload', UploaderManager.getContainer()).bind('fileuploadsubmit', function (e, data) {
var $this = $(this); var $this = $(this);
var params = [];
data.formData = [];
//get form datas attached to the file //get form datas attached to the file
data.formData = $.extend( params.push(data.context.find('input, select').serializeArray());
data.context.find('input, select').serializeArray(), params.push($("input", $('.collection-status:visible', UploaderManager.getSettingsBox())).serializeArray());
$("input", $('.collection-status:visible', UploaderManager.getSettingsBox())).serializeArray(), params.push($("select", UploaderManager.getSettingsBox()).serializeArray());
$("select", UploaderManager.getSettingsBox()).serializeArray()
); $.each(params, function(i, p) {
$.each(p, function (i, f){
data.formData.push(f);
});
});
data.formData.push({ data.formData.push({
"name": "b64_image", "name": "b64_image",