kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop

Browse Source 
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  remove first slash in mass transaction changes
- Fix user event handler test
- Fix 404 view
This commit is contained in:
James Cole
2018-09-23 07:39:31 +02:00
parent 0bd818956f c119b9cc7b
commit d49a13b091
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/js/ff/transactions/list.js vendored
View File

@@ -67,7 +67,7 @@ function goToMassEdit() {
baseHref = bases[0].href;
}
window.location.href = baseHref + '/transactions/mass/edit/' + checkedArray;
window.location.href = baseHref + 'transactions/mass/edit/' + checkedArray;
return false;
}
@@ -87,7 +87,7 @@ function goToBulkEdit() {
baseHref = bases[0].href;
}
window.location.href = baseHref + '/transactions/bulk/edit/' + checkedArray;
window.location.href = baseHref + 'transactions/bulk/edit/' + checkedArray;
return false;
}
@@ -106,7 +106,7 @@ function goToMassDelete() {
if (bases.length > 0) {
baseHref = bases[0].href;
}
window.location.href = baseHref + '/transactions/mass/delete/' + checkedArray;
window.location.href = baseHref + 'transactions/mass/delete/' + checkedArray;
return false;
}
@@ -229,4 +229,4 @@ function startMassSelect() {
$('.mass_reconcile').hide();
return false;
}
}

11
resources/views/errors/404.twig
View File

@@ -7,9 +7,18 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<base href="{{ route('index') }}/">
<link rel="stylesheet" href="css/app.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
{# libraries #}
<link href="lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# the theme #}
<link href="lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/adminlte/css/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# Firefly III customisations #}
<link href="css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{% include('partials.favicons') %}
</head>
<body class="ff-error-page">

10
tests/Unit/Handlers/Events/UserEventHandlerTest.php
View File

@@ -81,7 +81,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->user();
$event = new Login($user, true);
$event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -99,7 +99,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->emptyUser();
$event = new Login($user, true);
$event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -121,7 +121,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->emptyUser();
$event = new Login($user, true);
$event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -141,7 +141,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->user();
$event = new Login($user, true);
$event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -159,7 +159,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->emptyUser();
$event = new Login($user, true);
$event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff