summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerghei MIHAI <smihai@entrouvert.com>2014-10-01 18:16:06 (GMT)
committerMikaël Ates <mates@entrouvert.com>2014-10-03 07:06:59 (GMT)
commit02ce35550b3b5e3404c3a4dac696f83e35965c82 (patch)
tree9dd8f4d3a4fb7e5840f1c5a59c3e7db8d3e22ca9
parent04eb569d569ffea3522f6339b9a672174406f30f (diff)
downloadcalebasse-02ce35550b3b5e3404c3a4dac696f83e35965c82.zip
calebasse-02ce35550b3b5e3404c3a4dac696f83e35965c82.tar.gz
calebasse-02ce35550b3b5e3404c3a4dac696f83e35965c82.tar.bz2
agenda: reccuring appointment end date read only if related acts pointed
Closes #5594 Signed-off-by: Mikaël Ates <mates@entrouvert.com>
-rw-r--r--calebasse/static/js/calebasse.dialog.js3
-rw-r--r--calebasse/static/js/common.js2
2 files changed, 2 insertions, 3 deletions
diff --git a/calebasse/static/js/calebasse.dialog.js b/calebasse/static/js/calebasse.dialog.js
index 149e98e..6fda6a0 100644
--- a/calebasse/static/js/calebasse.dialog.js
+++ b/calebasse/static/js/calebasse.dialog.js
@@ -22,8 +22,7 @@ function generic_ajaxform_dialog(url, title, id, width, btn_submit_name, redirec
height = 'auto';
$(id).load(url,
function () {
- $('.datepicker-date').datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
- $('.datepicker input').datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
+ init_datepickers(id);
function onsuccess(response, status, xhr, form) {
enable_button($('#submit-btn'));
var parse = $(response);
diff --git a/calebasse/static/js/common.js b/calebasse/static/js/common.js
index 8d29cd8..3a43551 100644
--- a/calebasse/static/js/common.js
+++ b/calebasse/static/js/common.js
@@ -9,5 +9,5 @@ function delete_prompt(text) {
function init_datepickers(on) {
$('.datepicker-date', on).datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
- $('.datepicker input', on).datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
+ $('.datepicker input[type=text]', on).datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
}