Commit 028b8c30 authored by tonyemma's avatar tonyemma
parents 89b5c5ce 7698e8ac
......@@ -162,6 +162,7 @@ var calendar = {
if(notNull(initMode))
calendar.viewMode=initMode;
$(calendar.domTarget).fullCalendar('destroy');
calendar.eventsList = {};
$(calendar.domTarget).fullCalendar({
header : {
left : 'prev,next',
......@@ -338,6 +339,7 @@ var calendar = {
searchObject.nbPage=0;
pageCount=false;
searchObject.count=true;
directory.scrollTop = false;
startSearch(0);
},
closePopovers : function() {
......@@ -373,7 +375,7 @@ var calendar = {
showPopup : false,
//creates fullCalendar
buildCalObj: function(eventObj) {
// mylog.log("calendar.buildCalObj ", eventObj);
//mylog.log("calendar.buildCalObj ", eventObj);
//entries for the calendar
var organiser = "";
if("undefined" != typeof eventObj["links"] && "undefined" != typeof eventObj.links["organizer"]){
......@@ -438,9 +440,8 @@ var calendar = {
costum.calendar != null &&
typeof costum.calendar.buildCalObj == "function")
taskCal = costum.calendar.buildCalObj(eventObj, taskCal);
mylog.log("calendar.buildCalObj taskCal", taskCal);
}
//mylog.log("calendar.buildCalObj taskCal", taskCal);
return taskCal;
},
showInCalendar : function (events) {
......@@ -469,8 +470,10 @@ var calendar = {
//mylog.log("calendar.addEvents", events);
if(events){
$.each(events,function(eventId,eventObj){
//mylog.log("calendar.addEvents eventCal", eventCal);
if(typeof calendar.eventsList[eventId]=="undefined"){
var eventCal = calendar.buildCalObj(eventObj);
//mylog.log("calendar.addEvents eventCal", eventCal);
if(eventCal){
calendar.eventsList[eventId]=eventCal ;
$(calendar.domTarget).fullCalendar('renderEvent', eventCal, true);
......
......@@ -142,13 +142,14 @@ function autoCompleteSearch(indexMin, indexMax, callBack, notUrl){
$('.btn-start-search').removeClass('bg-dark');
if((indexMin==0 || (typeof pageEvent != 'undefined' && pageEvent)) && directory.appKeyParam != '#agenda' ){
coInterface.simpleScroll(0, 400);
if(directory.scrollTop === true)
coInterface.simpleScroll(0, 400);
coInterface.showLoader('#dropdown_search',trad.currentlyresearching);
mapCO.showLoader();
}else if(indexMin>0)
coInterface.showLoader('#btnShowMoreResult',trad.currentlyresearching);
directory.scrollTop = true;
if(isMapEnd)
coInterface.showLoader('#map-loading-data', trad.currentlyloading);
......@@ -600,6 +601,7 @@ var directory = {
multiTagsT : [],
multiScopesT :[],
appKeyParam : null,
scrollTop : true,
viewMode: directoryViewMode,
costum : ( typeof costum != 'undefined' && costum != null
&& typeof costum.htmlConstruct != 'undefined'
......
......@@ -27,7 +27,7 @@
<i class="fa fa-times"></i>
</button>
<?php
var_dump($element["creator"]);
//var_dump($element["creator"]);
if( $element["creator"] == Yii::app()->session["userId"] ||
Authorisation::canEditItem( Yii::app()->session["userId"], "poi", $id, @$element["parentType"], @$element["parentId"] ) ){ ?>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment