IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the bug that would unintentionally not let you edit accounts without changing their name. Closed #83

Browse Source
This commit is contained in:
James Cole 2015-06-28 21:13:08 +02:00
parent 0258982e60
commit e70444f19a
3 changed files with 77 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Validation/FireflyValidator.php
View File

@ -75,6 +75,10 @@ class FireflyValidator extends Validator
if (isset($this->data['account_type_id'])) { if (isset($this->data['account_type_id'])) {
return $this->validateByAccountTypeId($value, $parameters); return $this->validateByAccountTypeId($value, $parameters);
} }
if(isset($this->data['id'])) {
return $this->validateByAccountId($value, $parameters);
}
return false; return false;
} }
@ -167,6 +171,33 @@ class FireflyValidator extends Validator
} }
/**
* @param $value
* @param $parameters
*
* @return bool
*/
protected function validateByAccountId($value, $parameters)
{
/** @var Account $existingAccount */
$existingAccount = Account::find($this->data['id']);
$type = $existingAccount->accountType;
$ignore = $existingAccount->id;
$value = $this->tryDecrypt($value);
$set = Auth::user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get();
/** @var Account $entry */
foreach ($set as $entry) {
if ($entry->name == $value) {
return false;
}
}
return true;
}
/** /**
* @param $attribute * @param $attribute
* @param $value * @param $value

1
resources/lang/en/validation.php
View File

@ -23,6 +23,7 @@ return [
"unique_for_user" => "There already is an entry with this :attribute.", "unique_for_user" => "There already is an entry with this :attribute.",
"before" => "The :attribute must be a date before :date.", "before" => "The :attribute must be a date before :date.",
'unique_object_for_user' => 'This name is already in use', 'unique_object_for_user' => 'This name is already in use',
'unique_account_for_user' => 'This account name is already in use',
"between" => [ "between" => [
"numeric" => "The :attribute must be between :min and :max.", "numeric" => "The :attribute must be between :min and :max.",
"file" => "The :attribute must be between :min and :max kilobytes.", "file" => "The :attribute must be between :min and :max kilobytes.",

1
resources/lang/nl/validation.php
View File

@ -23,6 +23,7 @@ return [
"unique_for_user" => "There already is an entry with this :attribute.", "unique_for_user" => "There already is an entry with this :attribute.",
"before" => "The :attribute must be a date before :date.", "before" => "The :attribute must be a date before :date.",
'unique_object_for_user' => 'Deze naam is al in gebruik', 'unique_object_for_user' => 'Deze naam is al in gebruik',
'unique_account_for_user' => 'This rekeningnaam is already in use',
"between" => [ "between" => [
"numeric" => "The :attribute must be between :min and :max.", "numeric" => "The :attribute must be between :min and :max.",
"file" => "The :attribute must be between :min and :max kilobytes.", "file" => "The :attribute must be between :min and :max kilobytes.",