Fix datepicker end of year and form query in 2.1

git-svn-id: https://svn.eudat.eu/EUDAT/Services/MetaData/ckanext-datesearch@1373 68e52488-0a15-44bc-a314-416658652264
This commit is contained in:
Mikael Karlsson 2013-12-09 12:26:32 +00:00
parent c2fe606dfa
commit 1b48ad2cb8
1 changed files with 8 additions and 3 deletions

View File

@ -25,6 +25,10 @@ this.ckan.module('daterangepicker-module', function ($, _) {
// Add hidden <input> tags #ext_startdate and #ext_enddate,
// if they don't already exist.
var form = $("#dataset-search");
// CKAN 2.1
if (!form.length) {
form = $(".search-form");
}
if ($("#ext_startdate").length === 0) {
$('<input type="hidden" id="ext_startdate" name="ext_startdate" />').appendTo(form);
}
@ -45,18 +49,19 @@ this.ckan.module('daterangepicker-module', function ($, _) {
// Format the start and end dates into strings in a date format
// that Solr understands.
var v = moment(ev.date).format('YYYY-MM-DDTHH:mm:ss') + 'Z';
var v = moment(ev.date);
var fs = 'YYYY-MM-DDTHH:mm:ss'
switch (ev.target.name) {
case 'start':
// Set the value of the hidden <input id="ext_startdate"> to
// the chosen start date.
$('#ext_startdate').val(v);
$('#ext_startdate').val(v.format(fs) + 'Z');
break;
case 'end':
// Set the value of the hidden <input id="ext_enddate"> to
// the chosen end date.
$('#ext_enddate').val(v);
$('#ext_enddate').val(v.add('y', 1).subtract('s', 1).format(fs) + 'Z');
break;
}