Skip to content

Commit

Permalink
Merge pull request #3302 from nextcloud/fix/settings/config-handling-…
Browse files Browse the repository at this point in the history
…stable25
  • Loading branch information
provokateurin authored Sep 30, 2024
2 parents dba363a + 84c2bff commit 7ea5d00
Show file tree
Hide file tree
Showing 5 changed files with 145 additions and 146 deletions.
10 changes: 10 additions & 0 deletions lib/Controller/FolderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ private function getRootFolderStorageId(): ?int {
/**
* @RequireGroupFolderAdmin
* @NoAdminRequired
* @PasswordConfirmationRequired
*/
public function addFolder(string $mountpoint): DataResponse {
$id = $this->manager->createFolder($mountpoint);
Expand All @@ -122,6 +123,7 @@ public function addFolder(string $mountpoint): DataResponse {
/**
* @NoAdminRequired
* @RequireGroupFolderAdmin
* @PasswordConfirmationRequired
*/
public function removeFolder(int $id): DataResponse {
$response = $this->checkFolderExists($id);
Expand All @@ -137,6 +139,7 @@ public function removeFolder(int $id): DataResponse {
/**
* @NoAdminRequired
* @RequireGroupFolderAdmin
* @PasswordConfirmationRequired
*/
public function setMountPoint(int $id, string $mountPoint): DataResponse {
$this->manager->setMountPoint($id, $mountPoint);
Expand All @@ -146,6 +149,7 @@ public function setMountPoint(int $id, string $mountPoint): DataResponse {
/**
* @NoAdminRequired
* @RequireGroupFolderAdmin
* @PasswordConfirmationRequired
*/
public function addGroup(int $id, string $group): DataResponse {
$response = $this->checkFolderExists($id);
Expand All @@ -159,6 +163,7 @@ public function addGroup(int $id, string $group): DataResponse {
/**
* @NoAdminRequired
* @RequireGroupFolderAdmin
* @PasswordConfirmationRequired
*/
public function removeGroup(int $id, string $group): DataResponse {
$response = $this->checkFolderExists($id);
Expand All @@ -172,6 +177,7 @@ public function removeGroup(int $id, string $group): DataResponse {
/**
* @NoAdminRequired
* @RequireGroupFolderAdmin
* @PasswordConfirmationRequired
*/
public function setPermissions(int $id, string $group, int $permissions): DataResponse {
$response = $this->checkFolderExists($id);
Expand All @@ -185,6 +191,7 @@ public function setPermissions(int $id, string $group, int $permissions): DataRe
/**
* @NoAdminRequired
* @RequireGroupFolderAdmin
* @PasswordConfirmationRequired
* @throws \OCP\DB\Exception
*/
public function setManageACL(int $id, string $mappingType, string $mappingId, bool $manageAcl): DataResponse {
Expand All @@ -199,6 +206,7 @@ public function setManageACL(int $id, string $mappingType, string $mappingId, bo
/**
* @NoAdminRequired
* @RequireGroupFolderAdmin
* @PasswordConfirmationRequired
*/
public function setQuota(int $id, int $quota): DataResponse {
$response = $this->checkFolderExists($id);
Expand All @@ -212,6 +220,7 @@ public function setQuota(int $id, int $quota): DataResponse {
/**
* @NoAdminRequired
* @RequireGroupFolderAdmin
* @PasswordConfirmationRequired
*/
public function setACL(int $id, bool $acl): DataResponse {
$response = $this->checkFolderExists($id);
Expand All @@ -225,6 +234,7 @@ public function setACL(int $id, bool $acl): DataResponse {
/**
* @NoAdminRequired
* @RequireGroupFolderAdmin
* @PasswordConfirmationRequired
*/
public function renameFolder(int $id, string $mountpoint): DataResponse {
$response = $this->checkFolderExists($id);
Expand Down
95 changes: 58 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"@nextcloud/stylelint-config": "^2.2.0",
"@nextcloud/webpack-vue-config": "^5.3.0",
"@types/bootstrap": "^5.2.4",
"@types/jquery": "^3.5.14",
"@types/react": "^17.0.43",
"@types/react-dom": "^18.0.3",
"@types/webpack": "^4.41.26",
Expand All @@ -36,7 +35,9 @@
"dependencies": {
"@nextcloud/axios": "^2.0.0",
"@nextcloud/event-bus": "^3.0.2",
"@nextcloud/password-confirmation": "4.0.4",
"@nextcloud/router": "^2.0.0",
"@nextcloud/typings": "^1.9.1",
"@nextcloud/vue": "^7.3.0",
"nextcloud-server": "^0.15.10",
"oc-react-components": "^0.2.1",
Expand Down
Loading

0 comments on commit 7ea5d00

Please sign in to comment.