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

Various Javascript fixes.

Browse Source
This commit is contained in:
James Cole
2017-01-02 12:09:46 +01:00
parent 811026dc4a
commit 9352ee3e25
15 changed files with 31 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/HomeController.php
View File

@@ -63,7 +63,6 @@ class HomeController extends Controller
// a possible problem with the budgets.
if ($label === strval(trans('firefly.everything')) || $label === strval(trans('firefly.customRange'))) {
$isCustomRange = true;
//Preferences::set('viewRange', 'custom');
Log::debug('Range is now marked as "custom".');
}

6
app/Http/Controllers/TagController.php
View File

@@ -76,6 +76,7 @@ class TagController extends Controller
{
$subTitle = trans('firefly.new_tag');
$subTitleIcon = 'fa-tag';
$apiKey = env('GOOGLE_MAPS_API_KEY', '');
$preFilled = [
'tagMode' => 'nothing',
@@ -91,7 +92,7 @@ class TagController extends Controller
Session::flash('gaEventCategory', 'tags');
Session::flash('gaEventAction', 'create');
return view('tags.create', compact('subTitle', 'subTitleIcon'));
return view('tags.create', compact('subTitle', 'subTitleIcon', 'apiKey'));
}
/**
@@ -138,6 +139,7 @@ class TagController extends Controller
{
$subTitle = trans('firefly.edit_tag', ['tag' => $tag->tag]);
$subTitleIcon = 'fa-tag';
$apiKey = env('GOOGLE_MAPS_API_KEY', '');
/*
* Default tag options (again)
@@ -167,7 +169,7 @@ class TagController extends Controller
Session::flash('gaEventCategory', 'tags');
Session::flash('gaEventAction', 'edit');
return view('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'tagOptions'));
return view('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'tagOptions', 'apiKey'));
}
/**