kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

This prevents constraint errors when the specified category has already been set.

Browse Source
This commit is contained in:
James Cole
2016-01-23 16:48:15 +01:00
parent 664fde2344
commit 99d14e8cbe
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Rules/Actions/SetBudget.php
View File

@@ -55,7 +55,7 @@ class SetBudget implements ActionInterface
)->first(); )->first();
if (!is_null($budget)) { if (!is_null($budget)) {
Log::debug('Will set budget "' . $search . '" (#' . $budget->id . ') on journal #' . $this->journal->id . '.'); Log::debug('Will set budget "' . $search . '" (#' . $budget->id . ') on journal #' . $this->journal->id . '.');
$this->journal->budgets()->save($budget); $this->journal->budgets()->sync([$budget->id]);
} else { } else {
Log::debug('Could not find budget "' . $search . '". Failed.'); Log::debug('Could not find budget "' . $search . '". Failed.');
} }

2
app/Rules/Actions/SetCategory.php
View File

@@ -47,7 +47,7 @@ class SetCategory implements ActionInterface
$name = $this->action->action_value; $name = $this->action->action_value;
$category = Category::firstOrCreateEncrypted(['name' => $name, 'user_id' => Auth::user()->id]); $category = Category::firstOrCreateEncrypted(['name' => $name, 'user_id' => Auth::user()->id]);
Log::debug('Will set category "' . $name . '" (#' . $category->id . ') on journal #' . $this->journal->id . '.'); Log::debug('Will set category "' . $name . '" (#' . $category->id . ') on journal #' . $this->journal->id . '.');
$this->journal->categories()->save($category); $this->journal->categories()->sync([$category->id]);
return true; return true;
} }

20
phpunit.cover.xml
View File

@@ -23,10 +23,28 @@
</testsuites> </testsuites>
<filter> <filter>
<whitelist> <whitelist>
<directory suffix=".php">app/</directory> <directory suffix=".php">app/Http</directory>
</whitelist> </whitelist>
<blacklist> <blacklist>
<directory>vendor/</directory> <directory>vendor/</directory>
<directory>app/Console</directory>
<directory>app/Events</directory>
<directory>app/Exceptions</directory>
<directory>app/Generator</directory>
<directory>app/Handlers</directory>
<directory>app/Helpers</directory>
<directory>app/Jobs</directory>
<directory>app/Listeners</directory>
<directory>app/Models</directory>
<directory>app/Policies</directory>
<directory>app/Providers</directory>
<directory>app/Repositories</directory>
<directory>app/Rules</directory>
<directory>app/Sql</directory>
<directory>app/Support</directory>
<directory>app/Validation</directory>
<!-- and other directories, --> <!-- and other directories, -->
</blacklist> </blacklist>
</filter> </filter>