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

Merge pull request #218 from romainneutron/Fixes

Browse Source 
Fixes
This commit is contained in:
Romain Neutron
2012-09-27 01:38:49 -07:00
parent 2939350abf 11d688c989
commit dca51cf56d
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/Repositories/ValidationParticipantRepository.php
View File

@@ -37,7 +37,7 @@ class ValidationParticipantRepository extends EntityRepository
JOIN s.basket b
WHERE p.is_confirmed = 0
AND p.reminded IS NULL
AND s.expires < :date';
AND s.expires < :date AND s.expires > CURRENT_TIMESTAMP()';
return $this->_em->createQuery($dql)
->setParameter('date', $expireDate, Type::DATETIME)

19
templates/web/admin/databox/doc_structure.twig
View File

@@ -234,7 +234,12 @@
if(business.attr('checked')) {
$(this).val('0');
alert('{% trans 'A field can not be set both as title and business field. Remove business field flag before setting title' %}');
{% set sentence %}
{% trans 'A field can not be set both as title and business field. Remove business field flag before setting title' %}
{% endset %}
alert('{{ sentence |e("js") }}');
}
});
@@ -248,7 +253,12 @@
if(thumbtitle.val() != '0') {
$(this).removeAttr('checked');
alert('{% trans 'A field can not be set both as title and business field. Remove the title before setting the business flag' %}');
{% set sentence %}
{% trans 'A field can not be set both as title and business field. Remove the title before setting the business flag' %}
{% endset %}
alert('{{ sentence |e("js") }}');
}
});
@@ -329,7 +339,10 @@
});
$('.meta_deleter', container).bind('click', function(){
if(confirm('{% trans 'Etes vous sur de vouloir supprimer cette metadonnee ? Elle sera definitivement perdue' %}'))
{% set sentence %}
{% trans 'Etes vous sur de vouloir supprimer cette metadonnee ? Elle sera definitivement perdue' %}
{% endset %}
if(confirm('{{ sentence |e("js") }}'))
{
var field = $('input[name="field_ids[]"]', $(this).parent());
var field_id = $('input', $(this)).val();