From ffaf48dda7ef1f7adc5cc69180b4c82087b17fec Mon Sep 17 00:00:00 2001 From: Dorigo Date: Fri, 1 Sep 2017 11:15:36 +0200 Subject: [PATCH 1/3] Should fix rule, category and other name checks. #793 --- app/Models/Bill.php | 2 +- app/Validation/FireflyValidator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 8659be7749..91a5600200 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -28,7 +28,7 @@ use Watson\Validating\ValidatingTrait; class Bill extends Model { - use ValidatingTrait; + use SoftDeletes, ValidatingTrait; /** * The attributes that should be casted to native types. * diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index 62f6747123..ef16f8787b 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -387,7 +387,7 @@ class FireflyValidator extends Validator $exclude = $parameters[2] ?? 0; // get entries from table - $set = DB::table($table)->where('user_id', auth()->user()->id) + $set = DB::table($table)->where('user_id', auth()->user()->id)->whereNull('deleted_at') ->where('id', '!=', $exclude)->get([$field]); foreach ($set as $entry) { From edd1b25330ce85943afa3104b333427b9a524e4a Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 1 Sep 2017 11:19:49 +0200 Subject: [PATCH 2/3] Revert "Should fix rule, category and other name checks. #793" This reverts commit ffaf48dda7ef1f7adc5cc69180b4c82087b17fec. --- app/Models/Bill.php | 2 +- app/Validation/FireflyValidator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 91a5600200..8659be7749 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -28,7 +28,7 @@ use Watson\Validating\ValidatingTrait; class Bill extends Model { - use SoftDeletes, ValidatingTrait; + use ValidatingTrait; /** * The attributes that should be casted to native types. * diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index ef16f8787b..62f6747123 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -387,7 +387,7 @@ class FireflyValidator extends Validator $exclude = $parameters[2] ?? 0; // get entries from table - $set = DB::table($table)->where('user_id', auth()->user()->id)->whereNull('deleted_at') + $set = DB::table($table)->where('user_id', auth()->user()->id) ->where('id', '!=', $exclude)->get([$field]); foreach ($set as $entry) { From 85797a5d70fff917f2868f56aa54b7ec62887b90 Mon Sep 17 00:00:00 2001 From: Lukas Winkler Date: Sat, 30 Sep 2017 17:56:51 +0200 Subject: [PATCH 3/3] fix typo in nofollow --- resources/views/auth/lost-two-factor.twig | 2 +- resources/views/errors/404.twig | 2 +- resources/views/errors/FireflyException.twig | 2 +- resources/views/layout/default.twig | 2 +- resources/views/layout/empty.twig | 2 +- resources/views/layout/guest.twig | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/auth/lost-two-factor.twig b/resources/views/auth/lost-two-factor.twig index 08455fc2b8..d4099621c9 100644 --- a/resources/views/auth/lost-two-factor.twig +++ b/resources/views/auth/lost-two-factor.twig @@ -2,7 +2,7 @@ - + Firefly III diff --git a/resources/views/errors/404.twig b/resources/views/errors/404.twig index 9fdb9ff8a0..65d7a60e8f 100644 --- a/resources/views/errors/404.twig +++ b/resources/views/errors/404.twig @@ -2,7 +2,7 @@ - + 404 diff --git a/resources/views/errors/FireflyException.twig b/resources/views/errors/FireflyException.twig index 50e9e43419..b28718ef32 100644 --- a/resources/views/errors/FireflyException.twig +++ b/resources/views/errors/FireflyException.twig @@ -2,7 +2,7 @@ - + Firefly III diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index 051060ad85..26c5dcdd11 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -4,7 +4,7 @@ - + {% if subTitle %} {{ subTitle }} ยป diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig index d5c7c75a5e..c4019b384c 100644 --- a/resources/views/layout/empty.twig +++ b/resources/views/layout/empty.twig @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> - <meta name="robots" content="noindex, nofolllow, noarchive, noodp, NoImageIndex, noydir"> + <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir"> <title>Firefly III diff --git a/resources/views/layout/guest.twig b/resources/views/layout/guest.twig index ad5d56f213..34ccab304c 100644 --- a/resources/views/layout/guest.twig +++ b/resources/views/layout/guest.twig @@ -2,7 +2,7 @@ - + Firefly III {% if title != "Firefly" and title != "" %}