From cd664d7e88f42c37d5360a7e20aaef446a1bd2e6 Mon Sep 17 00:00:00 2001 From: Rap RIV Date: Tue, 7 Jan 2020 14:29:33 +0400 Subject: [PATCH] Hotfix agenda --- assets/js/default/calendar.js | 2 +- assets/js/default/directory.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/js/default/calendar.js b/assets/js/default/calendar.js index a89c932c..80eeb094 100644 --- a/assets/js/default/calendar.js +++ b/assets/js/default/calendar.js @@ -37,7 +37,7 @@ var agenda = { var startDDDD = new Date(startMoment); mylog.log("agenda.searchDay startDDDD", startDDDD); searchObject.startDate = Math.floor(startDDDD / 1000); - startSearch(10, 30, searchCallback); + startSearch(10, 30, searchCallback, true); }, addDay : function(){ mylog.log("agenda.addDay", this.dayCount); diff --git a/assets/js/default/directory.js b/assets/js/default/directory.js index 01c4132a..7a5ca7bd 100644 --- a/assets/js/default/directory.js +++ b/assets/js/default/directory.js @@ -21,7 +21,7 @@ var translate = {"organizations":"Organisations", "people":"Citoyens", "followers":"Ils nous suivent"}; -function startSearch(indexMin, indexMax, callBack){ +function startSearch(indexMin, indexMax, callBack, notUrl){ searchAllEngine.searchInProgress = true; mylog.log("directory.js startSearch agenda.", indexMin, indexMax); mylog.log("directory.js startSearch searchObject.types agenda.", searchObject.types); @@ -51,7 +51,7 @@ function startSearch(indexMin, indexMax, callBack){ mylog.log("directory.js startSearch", searchObject.indexMin, indexMax, searchObject.indexStep, searchObject.types); searchObject.indexMin = (typeof indexMin == "undefined") ? 0 : indexMin; - autoCompleteSearch(indexMin, indexMax, callBack); + autoCompleteSearch(indexMin, indexMax, callBack, notUrl); } } @@ -101,9 +101,9 @@ function removeSearchType(type){ } } -function autoCompleteSearch(indexMin, indexMax, callBack){ +function autoCompleteSearch(indexMin, indexMax, callBack, notUrl){ mylog.log("START -------- autoCompleteSearch! agenda. ", typeof callBack, callBack, searchObject.types); - var data=searchInterface.constructObjectAndUrl(); + var data=searchInterface.constructObjectAndUrl(notUrl); mylog.log("autoCompleteSearch! agenda. searchObject.types", searchObject.types); //mylog.log("DATE ***", searchType[0], STARTDATE, ENDDATE); /*if(searchObject.initType=="events" && searchObject.text==""){ -- GitLab