bug fixes following merge

This commit is contained in:
zebardy 2020-02-19 00:24:01 +00:00
parent a3f5efdd5b
commit a3cdb85317
25 changed files with 18 additions and 54 deletions

View File

@ -5,8 +5,14 @@ namespace Grocy\Controllers;
use \Grocy\Services\DatabaseService;
use \Grocy\Services\ApplicationService;
use \Grocy\Services\LocalizationService;
use \Grocy\Services\StockService;
use \Grocy\Services\UsersService;
use \Grocy\Services\UserfieldsService;
use \Grocy\Services\BatteriesService;
use \Grocy\Services\CalendarService;
use \Grocy\Services\SessionService;
use \Grocy\Services\RecipesService;
use \Grocy\Services\TasksService;
class BaseController
{

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\BatteriesService;
class BatteriesApiController extends BaseApiController
{
public function __construct(\DI\Container $container)

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\BatteriesService;
class BatteriesController extends BaseController
{
public function __construct(\DI\Container $container)

View File

@ -2,9 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\CalendarService;
use \Grocy\Services\ApiKeyService;
class CalendarApiController extends BaseApiController
{
public function __construct(\DI\Container $container)

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\CalendarService;
class CalendarController extends BaseController
{
public function __construct(\DI\Container $container)

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\ChoresService;
class ChoresApiController extends BaseApiController
{
public function __construct(\DI\Container $container)

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\ChoresService;
class ChoresController extends BaseController
{
public function __construct(\DI\Container $container)

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\FilesService;
class FilesApiController extends BaseApiController
{
public function __construct(\DI\Container $container)

View File

@ -2,10 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\SessionService;
use \Grocy\Services\DatabaseMigrationService;
use \Grocy\Services\DemoDataGeneratorService;
class LoginController extends BaseController
{
public function __construct(\DI\Container $container, string $sessionCookieName)

View File

@ -2,9 +2,6 @@
namespace Grocy\Controllers;
#use \Grocy\Services\ApplicationService;
use \Grocy\Services\ApiKeyService;
class OpenApiController extends BaseApiController
{
public function __construct(\DI\Container $container)

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\RecipesService;
class RecipesApiController extends BaseApiController
{
public function __construct(\DI\Container $container)

View File

@ -2,10 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\RecipesService;
use \Grocy\Services\StockService;
use \Grocy\Services\UserfieldsService;
class RecipesController extends BaseController
{
public function __construct(\DI\Container $container)

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\StockService;
class StockApiController extends BaseApiController
{
public function __construct(\DI\Container $container)

View File

@ -2,9 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\StockService;
use \Grocy\Services\UserfieldsService;
class StockController extends BaseController
{

View File

@ -2,9 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\DatabaseMigrationService;
use \Grocy\Services\DemoDataGeneratorService;
class SystemController extends BaseController
{

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\TasksService;
class TasksApiController extends BaseApiController
{
public function __construct(\DI\Container $container)

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\TasksService;
class TasksController extends BaseController
{
public function __construct(\DI\Container $container)

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers;
use \Grocy\Services\UsersService;
class UsersApiController extends BaseApiController
{
public function __construct(\DI\Container $container)

View File

@ -2,8 +2,8 @@
namespace Grocy\Services;
use \Grocy\Services\DatabaseService;
use \Grocy\Services\LocalizationService;
#use \Grocy\Services\DatabaseService;
#use \Grocy\Services\LocalizationService;
class BaseService
{

View File

@ -2,11 +2,11 @@
namespace Grocy\Services;
use \Grocy\Services\StockService;
use \Grocy\Services\TasksService;
use \Grocy\Services\ChoresService;
use \Grocy\Services\BatteriesService;
use \Grocy\Services\UsersService;
#use \Grocy\Services\StockService;
#use \Grocy\Services\TasksService;
#use \Grocy\Services\ChoresService;
#use \Grocy\Services\BatteriesService;
#use \Grocy\Services\UsersService;
use \Grocy\Helpers\UrlManager;
class CalendarService extends BaseService

View File

@ -2,7 +2,7 @@
namespace Grocy\Services;
use \Grocy\Services\StockService;
#use \Grocy\Services\StockService;
class ChoresService extends BaseService
{

View File

@ -2,7 +2,7 @@
namespace Grocy\Services;
use \Grocy\Services\ApplicationService;
#use \Grocy\Services\ApplicationService;
class DatabaseService
{

View File

@ -2,7 +2,7 @@
namespace Grocy\Services;
use \Grocy\Services\LocalizationService;
#use \Grocy\Services\LocalizationService;
class DemoDataGeneratorService extends BaseService
{

View File

@ -2,7 +2,7 @@
namespace Grocy\Services;
use \Grocy\Services\DatabaseService;
#use \Grocy\Services\DatabaseService;
use \Gettext\Translation;
use \Gettext\Translations;
use \Gettext\Translator;

View File

@ -2,7 +2,7 @@
namespace Grocy\Services;
use \Grocy\Services\StockService;
#use \Grocy\Services\StockService;
class RecipesService extends BaseService
{