DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 14:27:33 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Save email/username format in settings controller

Browse source
This commit is contained in:
snipe 2016-06-01 15:45:26 -07:00
parent eacf70ee3f
commit 9c4cd9c3ce
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Http/Controllers/SettingsController.php
View file

@ -16,7 +16,6 @@ use Crypt;
use Mail; use Mail;
use App\Models\User; use App\Models\User;
use App\Http\Requests\SetupUserRequest; use App\Http\Requests\SetupUserRequest;
use App\Http\Requests\SettingRequest;
/** /**
* This controller handles all actions related to Settings for * This controller handles all actions related to Settings for
@ -176,14 +175,16 @@ class SettingsController extends Controller
$settings->alert_email = e(Input::get('email')); $settings->alert_email = e(Input::get('email'));
$settings->alerts_enabled = 1; $settings->alerts_enabled = 1;
$settings->brand = 1; $settings->brand = 1;
$settings->locale = 'en';
$settings->default_currency = 'USD'; $settings->default_currency = 'USD';
$settings->user_id = 1; $settings->user_id = 1;
$settings->email_domain = e(Input::get('email_domain'));
$settings->email_format = e(Input::get('email_format'));
if ((!$user->isValid('initial')) && (!$settings->isValid('initial'))) {
if ((!$user->isValid()) || (!$settings->isValid())) {
return redirect()->back()->withInput()->withErrors($user->getErrors())->withErrors($settings->getErrors()); return redirect()->back()->withInput()->withErrors($user->getErrors())->withErrors($settings->getErrors());
} else { } else {
$user->save();
$settings->save();
if (Input::get('email_creds')=='1') { if (Input::get('email_creds')=='1') {
Mail::send(['text' => 'emails.firstadmin'], $data, function ($m) use ($data) { Mail::send(['text' => 'emails.firstadmin'], $data, function ($m) use ($data) {
@ -192,6 +193,7 @@ class SettingsController extends Controller
}); });
} }
return redirect()->route('setup.done'); return redirect()->route('setup.done');
} }
@ -288,7 +290,7 @@ class SettingsController extends Controller
* @since [v1.0] * @since [v1.0]
* @return Redirect * @return Redirect
*/ */
public function postEdit(SettingRequest $request) public function postEdit()
{ {
// Check if the asset exists // Check if the asset exists
@ -338,6 +340,9 @@ class SettingsController extends Controller
$setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0')); $setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0'));
$setting->alert_interval = e(Input::get('alert_interval')); $setting->alert_interval = e(Input::get('alert_interval'));
$setting->alert_threshold = e(Input::get('alert_threshold')); $setting->alert_threshold = e(Input::get('alert_threshold'));
$setting->email_domain = e(Input::get('email_domain'));
$setting->email_format = e(Input::get('email_format'));
$setting->username_format = e(Input::get('username_format'));
$setting->labels_per_page = e(Input::get('labels_per_page')); $setting->labels_per_page = e(Input::get('labels_per_page'));