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-284 Fix javascript issue

Browse Source
This commit is contained in:
Nicolas Le Goff
2015-01-12 17:17:31 +01:00
parent b118d4d947
commit 058fcfce06
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
templates/web/report/report_layout_child.html.twig
View File

@@ -178,12 +178,12 @@
<div>
<input name="tbl" type="radio" value="WDOC" data-action="{{ path('report_activity_documents_pushed') }}" id="WDOC" class="formsubmiter" />
<label for="WDOC">{% trans "report:: document" %}</label>
<select class="options" style="display:inline;display:none;" id="list-select3" name="docwhat" >
<option selected ="selected" value="PUSHDOC" data-action="{{ path('report_activity_documents_pushed') }}" class="formsubmiter">{% trans "report:: pushe" %}</option>
<option value="ADDDOC" data-action="{{ path('report_activity_documents_added') }}" class="formsubmiter">{% trans "report:: ajoute" %}</option>
<option value="EDIDOC" data-action="{{ path('report_activity_documents_edited') }}" class="formsubmiter">{% trans "report:: edite" %}</option>
<option value="VALIDOC" data-action="{{ path('report_activity_documents_validated') }}" class="formsubmiter">{% trans "report:: valide" %}</option>
<option value="SENTDOC" data-action="{{ path('report_activity_documents_sent') }}" class="formsubmiter">{% trans "Sent" %}</option>
<select class="options formsubmiter" style="display:inline;display:none;" id="list-select3" name="docwhat" >
<option selected ="selected" value="PUSHDOC" data-action="{{ path('report_activity_documents_pushed') }}" >{% trans "report:: pushe" %}</option>
<option value="ADDDOC" data-action="{{ path('report_activity_documents_added') }}" >{% trans "report:: ajoute" %}</option>
<option value="EDIDOC" data-action="{{ path('report_activity_documents_edited') }}" >{% trans "report:: edite" %}</option>
<option value="VALIDOC" data-action="{{ path('report_activity_documents_validated') }}" >{% trans "report:: valide" %}</option>
<option value="SENTDOC" data-action="{{ path('report_activity_documents_sent') }}" >{% trans "Sent" %}</option>
</select>
</div>
</div>

7
www/skins/report/report.js
View File

@@ -74,9 +74,14 @@ function bindEvents() {
loadDash();
});
//load all the report
$('form .formsubmiter').bind('click', function () {
$('form input.formsubmiter').bind('click', function () {
submiterAction($(this));
});
$('form select.formsubmiter').bind('change', function () {
submiterAction($("option:selected", $(this)));
});
//reload the content by pressing enter key, it concerns the number of result by report
$('form .entersubmiter').bind('keypress', function (event) {
if (event.keyCode == '13') {