Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing storage to read properties back correctly r=vlad

Browse Source
This commit is contained in:
pavlov%pavlov.net 2005-06-14 23:22:07 +00:00
parent 1caf0a117d
commit 41a67763e6
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calendar/base/src/calItemBase.js
View File

@ -431,6 +431,7 @@ calItemBase.prototype = {
"ATTENDEE": true,
"ORGANIZER": true,
"RECURRENCE-ID": true,
"ALARMTIME": true,
},
icsBasePropMap: [

48
calendar/providers/storage/calStorageCalendar.js
View File

@ -977,12 +977,24 @@ calStorageCalendar.prototype = {
// For the extra-item data, note that we use mDBTwo, so that
// these can be executed while a selectItems is running!
this.mSelectAttendeesForItem = createStatement(
this.mDBTwo,
"SELECT * FROM cal_attendees " +
"WHERE item_id = :item_id AND recurrence_id IS NULL"
);
this.mSelectAttendeesForItemWithRecurrenceId = createStatement(
this.mDBTwo,
"SELECT * FROM cal_attendees " +
"WHERE item_id = :item_id AND recurrence_id = :recurrence_id AND recurrence_id_tz = :recurrence_id_tz"
);
this.mSelectPropertiesForItem = createStatement(
this.mDBTwo,
"SELECT * FROM cal_properties " +
"WHERE item_id = :item_id AND recurrence_id IS NULL"
);
this.mSelectPropertiesForItemWithRecurrenceId = createStatement(
this.mDBTwo,
"SELECT * FROM cal_properties " +
"WHERE item_id = :item_id AND recurrence_id = :recurrence_id AND recurrence_id_tz = :recurrence_id_tz"
@ -1143,24 +1155,40 @@ calStorageCalendar.prototype = {
getAdditionalDataForItem: function (item, flags) {
if (flags & CAL_ITEM_FLAG_HAS_ATTENDEES) {
this.mSelectAttendeesForItem.params.item_id = item.id;
this.setDateParamHelper(this.mSelectAttendeesForItem.params, "recurrence_id", item.recurrenceId);
while (this.mSelectAttendeesForItem.step()) {
var attendee = this.getAttendeeFromRow(this.mSelectAttendeesForItem.row);
var selectItem = null;
if (item.recurrenceId == null)
selectItem = this.mSelectAttendeesForItem;
else {
selectItem = this.mSelectAttendeesForItemWithRecurrenceId;
this.setDateParamHelper(selectItem.params, "recurrence_id", item.recurrenceId);
}
selectItem.params.item_id = item.id;
while (selectItem.step()) {
var attendee = this.getAttendeeFromRow(selectItem.row);
item.addAttendee(attendee);
}
this.mSelectAttendeesForItem.reset();
selectItem.reset();
}
var row;
if (flags & CAL_ITEM_FLAG_HAS_PROPERTIES) {
this.mSelectPropertiesForItem.params.item_id = item.id;
this.setDateParamHelper(this.mSelectPropertiesForItem.params, "recurrence_id", item.recurrenceId);
while (this.mSelectPropertiesForItem.step()) {
row = this.mSelectPropertiesForItem.row;
var selectItem = null;
if (item.recurrenceId == null)
selectItem = this.mSelectPropertiesForItem;
else {
selectItem = this.mSelectPropertiesForItemWithRecurrenceId;
this.setDateParamHelper(selectItem.params, "recurrence_id", item.recurrenceId);
}
selectItem.params.item_id = item.id;
while (selectItem.step()) {
row = selectItem.row;
item.setProperty (row.key, row.value);
}
this.mSelectPropertiesForItem.reset();
selectItem.reset();
}
var i;