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

Merge branch '3.8'

Browse Source 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/classes/Feed/Entry/Item.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
This commit is contained in:
Romain Neutron
2013-10-28 18:21:15 +01:00
parent fd3bd29fd2 9d69c8dc3f
commit 96ac795d8d
10 changed files with 222 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/web/common/dialog_export.html.twig
View File

@@ -246,7 +246,6 @@
<button type="button" class="close_button btn btn-inverse">{% trans 'boutton::annuler'%}</button>
</div>
</form>
<iframe style="display:none;" name="sendmail_target"></iframe>
</div>
</div>
{% endif %}
@@ -798,8 +797,13 @@
if (!check_TOU($('#sendmail'))) {
return false;
}
dialog.Close();
if ($('iframe[name=""]').length === 0) {
$('body').append('<iframe style="display:none;" name="sendmail_target"></iframe>');
}
$('#sendmail form').submit();
dialog.Close();
});
$('.datepicker', dialog.getDomElement()).datepicker({