github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-06 21:06:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes following merge

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/BaseController.php
View File

@ -5,8 +5,14 @@ namespace Grocy\Controllers;
use \Grocy\Services\DatabaseService; use \Grocy\Services\DatabaseService;
use \Grocy\Services\ApplicationService; use \Grocy\Services\ApplicationService;
use \Grocy\Services\LocalizationService; use \Grocy\Services\LocalizationService;
use \Grocy\Services\StockService;
use \Grocy\Services\UsersService; use \Grocy\Services\UsersService;
use \Grocy\Services\UserfieldsService; 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 class BaseController
{ {

2
controllers/BatteriesApiController.php
View File

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

2
controllers/BatteriesController.php
View File

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

3
controllers/CalendarApiController.php
View File

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

2
controllers/CalendarController.php
View File

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

2
controllers/ChoresApiController.php
View File

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

2
controllers/ChoresController.php
View File

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

2
controllers/FilesApiController.php
View File

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

4
controllers/LoginController.php
View File

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

3
controllers/OpenApiController.php
View File

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

2
controllers/RecipesApiController.php
View File

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

4
controllers/RecipesController.php
View File

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

2
controllers/StockApiController.php
View File

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

3
controllers/StockController.php
View File

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

3
controllers/SystemController.php
View File

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

2
controllers/TasksApiController.php
View File

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

2
controllers/TasksController.php
View File

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

2
controllers/UsersApiController.php
View File

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

4
services/BaseService.php
View File

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

10
services/CalendarService.php
View File

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

2
services/ChoresService.php
View File

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

2
services/DatabaseService.php
View File

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

2
services/DemoDataGeneratorService.php
View File

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

2
services/LocalizationService.php
View File

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

2
services/RecipesService.php
View File

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