Skip to content

Commit

Permalink
Remove classic sync code [schema change]
Browse files Browse the repository at this point in the history
  • Loading branch information
dstillman committed May 3, 2019
1 parent 64a54cd commit e2e017d
Show file tree
Hide file tree
Showing 44 changed files with 132 additions and 6,500 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zotero/dataserver",
"description": "Zotero Sync and API Server",
"description": "Zotero Data Server",
"license": "AGPL-3.0",
"require": {
"aws/aws-sdk-php": "^3.2",
Expand Down
19 changes: 0 additions & 19 deletions controllers/ApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -404,25 +404,6 @@ public function init($extra) {
}
}

// Return 409 if target library is locked
switch ($this->method) {
case 'POST':
case 'PUT':
case 'DELETE':
switch ($this->action) {
// Library lock doesn't matter for some admin requests
case 'keys':
case 'storageadmin':
break;

default:
if ($this->objectLibraryID && Zotero_Libraries::isLocked($this->objectLibraryID)) {
$this->e409("Target library is locked");
}
break;
}
}

$this->scopeObject = !empty($extra['scopeObject']) ? $extra['scopeObject'] : $this->scopeObject;
$this->subset = !empty($extra['subset']) ? $extra['subset'] : $this->subset;

Expand Down
Loading

0 comments on commit e2e017d

Please sign in to comment.