Skip to content

Commit

Permalink
Suppress conflict warnings for failed reservations
Browse files Browse the repository at this point in the history
This is normal any time you open an asset someone else is working on.

Closes #995
  • Loading branch information
acdha committed May 24, 2019
1 parent fc5cc5d commit 79b7480
Showing 1 changed file with 18 additions and 12 deletions.
30 changes: 18 additions & 12 deletions concordia/static/js/action-app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -978,20 +978,26 @@ export class ActionApp {
this.updateViewer();
})
.fail((jqXHR, textStatus, errorThrown) => {
console.error(
'Unable to reserve asset: %s %s',
textStatus,
errorThrown
);
if (jqXHR.status == 409) {
return;
} else {
console.error(
'Unable to reserve asset: %s %s',
textStatus,
errorThrown
);

this.reportError(
'reservation',
`Unable to reserve asset`,
errorThrown ? `${textStatus}: ${errorThrown}` : textStatus
);
this.reportError(
'reservation',
`Unable to reserve asset`,
errorThrown
? `${textStatus}: ${errorThrown}`
: textStatus
);

this.assetReserved = false;
this.updateViewer();
this.assetReserved = false;
this.updateViewer();
}
});
}

Expand Down

0 comments on commit 79b7480

Please sign in to comment.