PR#14: Merge branch 'develop' - taskotron/resultsdb_frontend

František Zatloukal • 6 years ago

77dc002

resultsdb_frontend.spec

file modified

+7 -1

		`@@ -1,6 +1,6 @@`
		`Name: resultsdb_frontend`
		# NOTE: if you update version, make sure to also update `resultsdb_frontend/__init__.py`
		`- Version: 2.1.1`
		`+ Version: 2.1.2`
		`Release: 1%{?dist}`
		`Summary: Frontend for the ResultsDB`

		`@@ -55,6 +55,12 @@`
		`%{_datadir}/resultsdb_frontend/*`

		`%changelog`
		`+ * Fri May 31 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 2.1.2-1`
		`+ - Fix default search doesn't show today's results`
		`+`
		`+ * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2`
		`+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild`
		`+`
		`* Tue Nov 27 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 2.1.1-1`
		`- Use Python 3`
		`- Limit searches by time by default and setting in the search UI`

resultsdb_frontend/__init__.py

file modified

+1 -1

		`@@ -28,7 +28,7 @@`
		`import os`

		`# the version as used in setup.py`
		`- __version__ = "2.1.1"`
		`+ __version__ = "2.1.2"`

		`# Flask App`
		`app = Flask(__name__)`

resultsdb_frontend/static/js/search.js

file modified

+4 -5

		`@@ -75,15 +75,14 @@`
		`start = moment(dates[0], 'YYYY-MM-DD');`
		`end = moment();`
		`if (dates.length > 1){`
		`- end = moment(dates[1], 'YYYY-MM-DD').subtract(1, 'days');`
		`+ end = moment(dates[1], 'YYYY-MM-DD');`
		`}`
		`- since = qs.since;`
		`}`
		`else {`
		`start = moment().subtract(29, 'days');`
		`end = moment();`
		`- since = start.format('YYYY-MM-DD') + ',' + end.format('YYYY-MM-DD');`
		`}`
		`+ since = start.format('YYYY-MM-DD') + 'T00:00:00,' + end.format('YYYY-MM-DD') + 'T23:59:59';`

		`$("#searchrange").daterangepicker({`
		`startDate: start,`
		`@@ -96,11 +95,11 @@`
		`}, function(start, end, label) {`
		`if (label === 'Custom Range'){`
		`//$('#searchrange').val(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));`
		`- since = start.format('YYYY-MM-DD') + ',' + end.add(1, 'days').format('YYYY-MM-DD');`
		`+ since = start.format('YYYY-MM-DD') + 'T00:00:00,' + end.format('YYYY-MM-DD') + 'T23:59:59';`
		`}`
		`else{`
		`$('#searchrange').val(label);`
		`- since = start.format('YYYY-MM-DD');`
		`+ since = start.format('YYYY-MM-DD') + 'T00:00:00,' + end.format('YYYY-MM-DD') + 'T23:59:59';`
		`}`
		`})`