inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up and merge fixes

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Lawrence Carvalho
2009-01-10 00:07:27 +00:00
parent 7ac1971fcc
commit 033263dfdb
3 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.html.ftl
View File

@@ -6,9 +6,9 @@
"event": "event":
{ {
"name": "${result.name}", "name": "${result.name}",
"from": "${result.from?string("yyyy-M-dd")}", "from": "${result.from?string("yyyy-MM-dd")}",
"start": "${result.from?string("HH:mm")}", "start": "${result.from?string("HH:mm")}",
"to": "${result.to?string("yyyy-M-dd")}", "to": "${result.to?string("yyyy-MM-dd")}",
"end": "${result.to?string("HH:mm")}", "end": "${result.to?string("HH:mm")}",
"uri": "${result.uri}", "uri": "${result.uri}",
"desc": "${result.desc}", "desc": "${result.desc}",

25
config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.js
View File

@@ -22,20 +22,21 @@ function getUserEvents(user, range)
{ {
return []; return [];
} }
var paths = [], events = [], event, results, result, j, jj, luceneQuery, siteTitles = {}; var paths = [], events = [], event, results, result, j, jj, luceneQuery, siteTitles = {};
var sites = siteService.listUserSites(user), site; var sites = siteService.listUserSites(user);
for (j = 0, jj = sites.length; j < jj; j++) for (var j=0; j < sites.length; j++)
{ {
site = sites[j]; site = sites[j];
paths.push("PATH:\"/app:company_home/st:sites/cm:" + search.ISO9075Encode(site.shortName) + "/cm:calendar/*\""); paths.push("PATH:\"/app:company_home/st:sites/cm:" + search.ISO9075Encode(sites[j].shortName) + "/cm:calendar/*\"");
siteTitles[site.shortName] = site.title; siteTitles[site.shortName] = site.title;
} }
if (paths.length != 0) var results = [];
if (paths.length > 0)
{ {
luceneQuery = "+(" + paths.join(" OR ") + ") +TYPE:\"{http\://www.alfresco.org/model/calendar}calendarEvent\""; var luceneQuery = "+(" + paths.join(" OR ") + ") +TYPE:\"{http\://www.alfresco.org/model/calendar}calendarEvent\"";
if (range.fromdate) if (range.fromdate)
{ {
// Expects the date in the format yyyy/mm/dd // Expects the date in the format yyyy/mm/dd
@@ -44,11 +45,13 @@ function getUserEvents(user, range)
luceneQuery += dateClause; luceneQuery += dateClause;
} }
results = search.luceneSearch(luceneQuery, "ia:fromDate", true); results = search.luceneSearch(luceneQuery, "ia:fromDate", true);
}
for (j = 0, jj = events.length; j < jj; j++) // repurpose results into custom array so as to add custom properties
var events = [];
for (var i=0;i<results.length;i++)
{ {
event = {}; var event = {};
result = results[i]; var e = results[i];
event.name = e.name; event.name = e.name;
event.title = e.properties["ia:whatEvent"]; event.title = e.properties["ia:whatEvent"];
event.where = e.properties["ia:whereEvent"]; event.where = e.properties["ia:whereEvent"];
@@ -61,8 +64,6 @@ function getUserEvents(user, range)
event.tags = e.tags.join(' '); event.tags = e.tags.join(' ');
events.push(event); events.push(event);
} }
}
return events; return events;
} }