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

Bump Phraseanet production client

Browse Source 
- fix search form and light refactoring
- fix double download
- misc fixes
This commit is contained in:
Florian BLOUET
2016-04-01 15:14:48 +02:00
parent 472bc088e2
commit 73eb344019
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -33,6 +33,6 @@
"postinstall": "./node_modules/.bin/gulp install;" "postinstall": "./node_modules/.bin/gulp install;"
}, },
"dependencies": { "dependencies": {
"phraseanet-production-client": "~0.10.0" "phraseanet-production-client": "~0.11.0"
} }
} }

4
templates/web/prod/actions/Download/prepare.html.twig
View File

@@ -108,16 +108,16 @@
$.post("{{ path('execute_download', {'token': token.getValue(), 'type': type, 'anonymous': anonymous}) }}", function(data){ $.post("{{ path('execute_download', {'token': token.getValue(), 'type': type, 'anonymous': anonymous}) }}", function(data){
if(data.success) { if(data.success) {
$('form[name=download]').submit(); $('form[name=download]').submit();
} else {
setTimeout("location.reload()", "{{ time ~ "000" }}");
} }
return false; return false;
}); });
setTimeout("location.reload()", "{{ time ~ "000" }}");
{% elseif (list['complete'] is defined and list['complete'])%} {# Zip done #} {% elseif (list['complete'] is defined and list['complete'])%} {# Zip done #}
// Get files // Get files
$('form[name=download]').submit(); $('form[name=download]').submit();
{% else %} {% else %}
setTimeout("location.reload()", "{{ time ~ "000" }}"); setTimeout("location.reload()", "{{ time ~ "000" }}");
{% endif %} {% endif %}
}); });

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

@@ -213,8 +213,7 @@
</div> </div>
</div> </div>
<div id="advancedSearchForm" class="controls controls-row adv_options" style="display:none;">
<div class="controls controls-row adv_options" style="display:none;">
<table style="width:100%; table-layout:fixed;"> <table style="width:100%; table-layout:fixed;">
<tr> <tr>
<td style="width:50%; vertical-align:top;"> <td style="width:50%; vertical-align:top;">
@@ -232,7 +231,7 @@
<td style="width:50%; vertical-align:top;"> <td style="width:50%; vertical-align:top;">
<div id="sbasfiltercont"> <div id="sbasfiltercont">
<div class="btn-toolbar"> <div class="btn-toolbar">
<input class="btn btn-inverse" type="button" value="{{ 'Re-initialiser' | trans }}" onclick="prodApp.appEvents.emit('search.doResetSearch');" /> <input class="btn btn-inverse search-reset-action" type="button" value="{{ 'Re-initialiser' | trans }}" />
</div> </div>
<div id="ADVSRCH_OPTIONS_ZONE"> <div id="ADVSRCH_OPTIONS_ZONE">
<div id="ADVSRCH_SORT_ZONE"> <div id="ADVSRCH_SORT_ZONE">