finallycoffee/nextcloud-pride-flags
5
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 10 Wiki Activity

Compare commits

base: finallycoffee:transcaffeine/global-setting
Branches Tags
finallycoffee:main finallycoffee:transcaffeine/refactor finallycoffee:app-1.1.1 finallycoffee:transcaffeine/global-setting finallycoffee:transcaffeine/fix-per-user finallycoffee:transcaffeine/prepare-release
finallycoffee:1.1.2 finallycoffee:1.1.1 finallycoffee:1.1.0 finallycoffee:1.0.1 finallycoffee:1.0.0 finallycoffee:1.0.0-rc.1 finallycoffee:1.0.0-rc.0 finallycoffee:0.1.0-rc.2 finallycoffee:0.1.0-rc.1 finallycoffee:0.1.0-rc.0
..
compare: finallycoffee:f961063ca577324e2fd8227afe6e6be5367dabd8
Branches Tags
finallycoffee:transcaffeine/refactor finallycoffee:main finallycoffee:app-1.1.1 finallycoffee:transcaffeine/global-setting finallycoffee:transcaffeine/fix-per-user finallycoffee:transcaffeine/prepare-release
finallycoffee:1.1.2 finallycoffee:1.1.1 finallycoffee:1.1.0 finallycoffee:1.0.1 finallycoffee:1.0.0 finallycoffee:1.0.0-rc.1 finallycoffee:1.0.0-rc.0 finallycoffee:0.1.0-rc.2 finallycoffee:0.1.0-rc.1 finallycoffee:0.1.0-rc.0

2 Commits
transcaffe ... f961063ca5

Author SHA1 Message Date
transcaffeine
f961063ca5 meta: bump version to 1.1.0 2024-08-09 21:37:17 +02:00
transcaffeine
0f98ff92c1 feat: allow global settings as fallback when user has not defined any 2024-08-09 21:36:02 +02:00
4 changed files with 73 additions and 75 deletions
Expand all files Collapse all files

6
js/pride-settings-global.js
View File

@ -1,8 +1,7 @@
(function(window) {
const folder_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.folder-flavour select')[0]; const folder_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.folder-flavour select')[0];
const button_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.button-flavour select')[0]; const button_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.button-flavour select')[0];
const submit_button = document.querySelectorAll('.pride_flags_server_settings .settings-pride-submit'); const submit_button = document.querySelectorAll('.pride_flags_user_settings .settings-pride-submit');
const container = document.querySelector('.pride_flags_server_settings .settings-section'); const container = document.querySelector('.pride_flags_server_settings settings-section')
function load() { function load() {
fetch(OC.generateUrl('/apps/pride_flags/settings/global')) fetch(OC.generateUrl('/apps/pride_flags/settings/global'))
@ -35,4 +34,3 @@
submit_button.forEach(node => node.addEventListener('click', e => save())); submit_button.forEach(node => node.addEventListener('click', e => save()));
load(); load();
})(window);

6
js/pride-settings.js
View File

@ -1,8 +1,9 @@
(function(window) {
const folder_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.folder-flavour select')[0]; const folder_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.folder-flavour select')[0];
const button_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.button-flavour select')[0]; const button_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.button-flavour select')[0];
const submit_button = document.querySelectorAll('.pride_flags_user_settings .settings-pride-submit'); const submit_button = document.querySelectorAll('.pride_flags_user_settings .settings-pride-submit');
const container = document.querySelector('.pride_flags_user_settings .settings-section'); const container = document.querySelector('.pride_flags_user_settings settings-section')
function load() { function load() {
fetch(OC.generateUrl('/apps/pride_flags/settings')) fetch(OC.generateUrl('/apps/pride_flags/settings'))
@ -35,4 +36,3 @@
submit_button.forEach(node => node.addEventListener('click', e => save())); submit_button.forEach(node => node.addEventListener('click', e => save()));
load(); load();
})(window);

5
lib/Controller/SettingsController.php
View File

@ -40,11 +40,6 @@ class SettingsController extends Controller {
return $this->makeJSONResponse(fn () => $this->appSettings->getGlobal()); return $this->makeJSONResponse(fn () => $this->appSettings->getGlobal());
} }
#[NoCSRFRequired]
public function getGlobal(): JSONResponse {
return $this->makeJSONResponse(fn () => $this->appSettings->getGlobal());
}
protected function makeJSONResponse(Closure $closure): JSONResponse { protected function makeJSONResponse(Closure $closure): JSONResponse {
try { try {
return new JSONResponse($closure(), HTTP::STATUS_OK); return new JSONResponse($closure(), HTTP::STATUS_OK);

9
lib/Settings/AppSettings.php
View File

@ -34,8 +34,8 @@ class AppSettings {
public function getGlobal(): array { public function getGlobal(): array {
return [ return [
AppSettings::FOLDER_VARIANT => $this->config->getAppValue(AppConstants::APP_ID, AppSettings::FOLDER_VARIANT, 'pride'), AppSettings::FOLDER_VARIANT => $this->config->getAppValue(AppSettings::APP_ID, AppSettings::FOLDER_VARIANT, 'pride'),
AppSettings::BUTTON_VARIANT => $this->config->getAppValue(AppConstants::APP_ID, AppSettings::BUTTON_VARIANT, 'trans'), AppSettings::BUTTON_VARIANT => $this->config->getAppValue(AppSettings::APP_ID, AppSettings::BUTTON_VARIANT, 'trans'),
]; ];
} }
@ -48,4 +48,9 @@ class AppSettings {
$this->setAppStringSetting(AppSettings::FOLDER_VARIANT, $folder); $this->setAppStringSetting(AppSettings::FOLDER_VARIANT, $folder);
$this->setAppStringSetting(AppSettings::BUTTON_VARIANT, $button); $this->setAppStringSetting(AppSettings::BUTTON_VARIANT, $button);
} }
public function setGlobal($folder, $button): void {
$this->setStringSetting('global', AppSettings::FOLDER_VARIANT, $folder);
$this->setStringSetting('global', AppSettings::BUTTON_VARIANT, $button);
}
} }