FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #273 from nkevins/fix_repo_saving

Browse Source 
Fix SettingsController saving boolean value as 'on'
This commit is contained in:
Nabeel Shahzad
2018-09-04 17:35:40 -04:00
committed by GitHub
parent 24fb55872f f46e5090ae
commit ec873f2b82
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/SettingsController.php
View File

@@ -40,6 +40,10 @@ class SettingsController extends Controller
continue; continue;
} }
if ($setting->type == 'bool' || $setting->type == 'boolean') {
$value = get_truth_state($value);
}
Log::info('Updating "'.$setting->id.'" from "'.$setting->value.'" to "'.$value.'"'); Log::info('Updating "'.$setting->id.'" from "'.$setting->value.'" to "'.$value.'"');
$setting->value = $value; $setting->value = $value;
$setting->save(); $setting->save();

2
app/Repositories/SettingRepository.php
View File

@@ -51,7 +51,7 @@ class SettingRepository extends Repository implements CacheableInterface
case 'bool': case 'bool':
case 'boolean': case 'boolean':
$value = $setting->value; $value = $setting->value;
return $value === 'true' || $value === '1' || $value === 1 || $value === 'on'; return $value === 'true' || $value === '1' || $value === 1;
case 'date': case 'date':
return Carbon::parse($setting->value); return Carbon::parse($setting->value);
case 'int': case 'int':

2
app/Services/UserService.php
View File

@@ -54,7 +54,7 @@ class UserService extends Service
public function createPilot(User $user, array $groups = null) public function createPilot(User $user, array $groups = null)
{ {
// Determine if we want to auto accept // Determine if we want to auto accept
if (get_truth_state(setting('pilots.auto_accept', false)) === true) { if (setting('pilots.auto_accept') === true) {
$user->state = UserState::ACTIVE; $user->state = UserState::ACTIVE;
} else { } else {
$user->state = UserState::PENDING; $user->state = UserState::PENDING;