CC-5596: Can Recreate an Instance in a Location that has been modified
Fixed by updating the modified instance's start/end time and leaving as a placeholder for future show updates
This commit is contained in:
parent
da0693eb3c
commit
22595c1098
|
@ -1030,11 +1030,6 @@ SQL;
|
||||||
if ($this->isUpdate) {
|
if ($this->isUpdate) {
|
||||||
if ($this->hasInstance($utcStartDateTime)) {
|
if ($this->hasInstance($utcStartDateTime)) {
|
||||||
$ccShowInstance = $this->getInstance($utcStartDateTime);
|
$ccShowInstance = $this->getInstance($utcStartDateTime);
|
||||||
// don't update instances that have been edited out of the repeating sequence
|
|
||||||
if ($ccShowInstance->getDbModifiedInstance() ||
|
|
||||||
in_array($ccShowInstance->getDbId(), $this->ccShow->getEditedRepeatingInstanceIds())) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$newInstance = false;
|
$newInstance = false;
|
||||||
$updateScheduleStatus = true;
|
$updateScheduleStatus = true;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1128,11 +1123,6 @@ SQL;
|
||||||
*/
|
*/
|
||||||
if ($this->isUpdate && $this->hasInstance($utcStartDateTime)) {
|
if ($this->isUpdate && $this->hasInstance($utcStartDateTime)) {
|
||||||
$ccShowInstance = $this->getInstance($utcStartDateTime);
|
$ccShowInstance = $this->getInstance($utcStartDateTime);
|
||||||
// don't update instances that have been edited out of the repeating sequence
|
|
||||||
if ($ccShowInstance->getDbModifiedInstance() ||
|
|
||||||
in_array($ccShowInstance->getDbId(), $this->ccShow->getEditedRepeatingInstanceIds())) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$newInstance = false;
|
$newInstance = false;
|
||||||
$updateScheduleStatus = true;
|
$updateScheduleStatus = true;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue