gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 21:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

set selection menu for expiration to 'date' if date is entered (Closes #423)

Browse Source
This commit is contained in:
Uwe Steinmann 2018-11-07 21:45:48 +01:00
parent 710fbc9b5a
commit 71e59f1a22
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
styles/bootstrap/application.js
View File

@ -30,8 +30,9 @@ $(document).ready( function() {
$('.datepicker, #expirationdate, #fromdate, #todate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate') $('.datepicker, #expirationdate, #fromdate, #todate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate')
.datepicker() .datepicker()
.on('changeDate', function(ev){ .on('changeDate', function(ev){
if(ev.date && $(ev.target).data('checkbox')) if(ev.date && $(ev.target).data('selectmenu')) {
$($(ev.target).data('checkbox')).prop('checked', false); $("#"+$(ev.target).data('selectmenu')).val('date');
}
$(ev.currentTarget).datepicker('hide'); $(ev.currentTarget).datepicker('hide');
}); });

2
views/bootstrap/class.Bootstrap.php
View File

@ -1047,7 +1047,7 @@ $(document).ready(function() {
function getDateChooser($defDate = '', $varName, $lang='') { /* {{{ */ function getDateChooser($defDate = '', $varName, $lang='') { /* {{{ */
$content = ' $content = '
<span class="input-append date span12 datepicker" id="'.$varName.'date" data-date="'.$defDate.'" data-date-format="yyyy-mm-dd"'.($lang ? 'data-date-language="'.str_replace('_', '-', $lang).'"' : '').'> <span class="input-append date span12 datepicker" id="'.$varName.'date" data-date="'.$defDate.'" data-selectmenu="presetexpdate" data-date-format="yyyy-mm-dd"'.($lang ? 'data-date-language="'.str_replace('_', '-', $lang).'"' : '').'>
<input class="span6" size="16" name="'.$varName.'" type="text" value="'.$defDate.'"> <input class="span6" size="16" name="'.$varName.'" type="text" value="'.$defDate.'">
<span class="add-on"><i class="icon-calendar"></i></span> <span class="add-on"><i class="icon-calendar"></i></span>
</span>'; </span>';