Changeset View
Changeset View
Standalone View
Standalone View
src/server/handler/modify.cpp
| Show First 20 Lines • Show All 134 Lines • ▼ Show 20 Line(s) | 134 | if (collection.parentId() != cmd.parentId()) { | |||
|---|---|---|---|---|---|
| 135 | if (!db->moveCollection(collection, Collection::retrieveById(cmd.parentId()))) { | 135 | if (!db->moveCollection(collection, Collection::retrieveById(cmd.parentId()))) { | ||
| 136 | return failureResponse("Unable to reparent collection"); | 136 | return failureResponse("Unable to reparent collection"); | ||
| 137 | } | 137 | } | ||
| 138 | changes.append(AKONADI_PARAM_PARENT); | 138 | changes.append(AKONADI_PARAM_PARENT); | ||
| 139 | } | 139 | } | ||
| 140 | } | 140 | } | ||
| 141 | 141 | | |||
| 142 | if (cmd.modifiedParts() & Protocol::ModifyCollectionCommand::RemoteID) { | 142 | if (cmd.modifiedParts() & Protocol::ModifyCollectionCommand::RemoteID) { | ||
| 143 | if (cmd.remoteId() != collection.remoteId()) { | 143 | if (cmd.remoteId() != collection.remoteId() && !cmd.remoteId().isEmpty()) { | ||
| 144 | if (!connection()->isOwnerResource(collection)) { | 144 | if (!connection()->isOwnerResource(collection)) { | ||
| 145 | qWarning() << "Invalid attempt to modify the collection remoteID from" << collection.remoteId() << "to" << cmd.remoteId(); | ||||
| 145 | return failureResponse("Only resources can modify remote identifiers"); | 146 | return failureResponse("Only resources can modify remote identifiers"); | ||
| 146 | } | 147 | } | ||
| 147 | collection.setRemoteId(cmd.remoteId()); | 148 | collection.setRemoteId(cmd.remoteId()); | ||
| 148 | changes.append(AKONADI_PARAM_REMOTEID); | 149 | changes.append(AKONADI_PARAM_REMOTEID); | ||
| 149 | } | 150 | } | ||
| 150 | } | 151 | } | ||
| 151 | 152 | | |||
| 152 | if (cmd.modifiedParts() & Protocol::ModifyCollectionCommand::RemoteRevision) { | 153 | if (cmd.modifiedParts() & Protocol::ModifyCollectionCommand::RemoteRevision) { | ||
| ▲ Show 20 Lines • Show All 158 Lines • Show Last 20 Lines | |||||