jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

code cleanup (#602)

Browse Source
This commit is contained in:
Kevin Papst
2019-02-26 02:26:37 +01:00
committed by GitHub
parent 03aa4c9ddc
commit 86832fb703
8 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Controller/EventController.php
View File

@@ -1,7 +1,7 @@
<?php <?php
/* /*
* This file is part of the AdminLTE bundle. * This file is part of the Kimai time-tracking app.
* *
* For the full copyright and license information, please view the LICENSE * For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code. * file that was distributed with this source code.

1
src/Event/ThemeEvent.php
View File

@@ -73,6 +73,7 @@ class ThemeEvent extends Event
public function addContent(string $content) public function addContent(string $content)
{ {
$this->content .= $content; $this->content .= $content;
return $this; return $this;
} }
} }

1
src/EventSubscriber/ThemeOptionsSubscriber.php
View File

@@ -66,7 +66,6 @@ class ThemeOptionsSubscriber implements EventSubscriberInterface
$skin = ''; $skin = '';
foreach ($user->getPreferences() as $ref) { foreach ($user->getPreferences() as $ref) {
$name = $ref->getName(); $name = $ref->getName();
switch ($name) { switch ($name) {
case UserPreference::SKIN: case UserPreference::SKIN:

2
src/Kernel.php
View File

@@ -88,7 +88,7 @@ class Kernel extends BaseKernel
continue; continue;
} }
yield new $pluginClass; yield new $pluginClass();
} }
} }

4
templates/macros/datatables.html.twig
View File

@@ -4,8 +4,8 @@
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'action.close'|trans }}"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">{{ 'modal.columns.title'|trans }}</h4> <h4 class="modal-title" id="data_table_modal_label">{{ 'modal.columns.title'|trans }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form name="{{ name }}_visibility"> <form name="{{ name }}_visibility">

2
templates/sidebar/settings.html.twig
View File

@@ -46,7 +46,7 @@
</li> </li>
{% endif %} {% endif %}
<li> <li>
<a href="{{ path('help') }}"> <a href="{{ constant('App\\Constants::HOMEPAGE') }}/documentation/" target="_blank">
<div class="pull-left image"> <div class="pull-left image">
<i class="{{ 'help'|icon }} text-gray"></i> <i class="{{ 'help'|icon }} text-gray"></i>
</div> </div>

3
tests/Controller/SidebarControllerTest.php
View File

@@ -9,6 +9,7 @@
namespace App\Tests\Controller; namespace App\Tests\Controller;
use App\Constants;
use App\Entity\User; use App\Entity\User;
/** /**
@@ -33,7 +34,7 @@ class SidebarControllerTest extends ControllerBaseTest
$this->assertContains('<a href="/en/profile/' . $user->getUsername() . '">', $content); $this->assertContains('<a href="/en/profile/' . $user->getUsername() . '">', $content);
$this->assertContains('<a href="/en/profile/' . $user->getUsername() . '/edit">', $content); $this->assertContains('<a href="/en/profile/' . $user->getUsername() . '/edit">', $content);
$this->assertContains('<a href="/en/profile/' . $user->getUsername() . '/prefs">', $content); $this->assertContains('<a href="/en/profile/' . $user->getUsername() . '/prefs">', $content);
$this->assertContains('<a href="/en/help/">', $content); $this->assertContains('<a href="' . Constants::HOMEPAGE . '/documentation/" target="_blank">', $content);
$this->assertContains('<a href="/en/logout">', $content); $this->assertContains('<a href="/en/logout">', $content);
} }
} }