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

fixes for things broken

Browse Source
This commit is contained in:
Aaron Moses 2019-12-22 23:29:22 +00:00
parent 146c7b6011
commit 8d4b8c91d7
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/StockController.php
View File

@ -74,7 +74,7 @@ class StockController extends BaseController
{ {
return $this->renderPage($response, 'consume', [ return $this->renderPage($response, 'consume', [
'products' => $this->getDatabase()->products()->orderBy('name'), 'products' => $this->getDatabase()->products()->orderBy('name'),
'recipes' => $this->getDatabase()->recipes()->orderBy('name') 'recipes' => $this->getDatabase()->recipes()->orderBy('name'),
'locations' => $this->getDatabase()->locations()->orderBy('name') 'locations' => $this->getDatabase()->locations()->orderBy('name')
]); ]);
} }

2
services/DemoDataGeneratorService.php
View File

@ -12,8 +12,6 @@ class DemoDataGeneratorService extends BaseService
$this->getLocalizationService() = new LocalizationService(GROCY_CULTURE); $this->getLocalizationService() = new LocalizationService(GROCY_CULTURE);
} }
protected $LocalizationService;
public function PopulateDemoData() public function PopulateDemoData()
{ {
$rowCount = $this->getDatabaseService()->ExecuteDbQuery('SELECT COUNT(*) FROM migrations WHERE migration = -1')->fetchColumn(); $rowCount = $this->getDatabaseService()->ExecuteDbQuery('SELECT COUNT(*) FROM migrations WHERE migration = -1')->fetchColumn();