diff --git a/Admin/Install/db.json b/Admin/Install/db.json index 710b826..e9e4e32 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -19,9 +19,7 @@ "name": "organization_unit_image", "type": "INT", "default": null, - "null": true, - "foreignTable": "media", - "foreignKey": "media_id" + "null": true }, "organization_unit_description": { "name": "organization_unit_description", diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 950b6e3..bd216a1 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -56,7 +56,10 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Organization/Theme/Backend/unit-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response)); - $mapper = UnitMapper::getAll()->with('parent')->with('image')->limit(25); + $mapper = UnitMapper::getAll() + ->with('parent') + ->with('image') + ->limit(25); if ($request->getData('ptype') === 'p') { $view->setData('units', $mapper->where('id', (int) ($request->getData('id') ?? 0), '<')->execute()); @@ -90,7 +93,14 @@ final class BackendController extends Controller $selectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response); $view->addData('unit-selector', $selectorView); - $view->addData('unit', UnitMapper::get()->with('parent')->with('image')->where('id', (int) $request->getData('id'))->execute()); + + $unit = UnitMapper::get() + ->with('parent') + ->with('image') + ->where('id', (int) $request->getData('id')) + ->execute(); + + $view->addData('unit', $unit); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $view->addData('editor', $editor); diff --git a/Theme/Backend/img/org_default.png b/Theme/Backend/img/org_default.png new file mode 100644 index 0000000..2354ccf Binary files /dev/null and b/Theme/Backend/img/org_default.png differ diff --git a/Theme/Backend/unit-create.tpl.php b/Theme/Backend/unit-create.tpl.php index 486b8da..6f49083 100755 --- a/Theme/Backend/unit-create.tpl.php +++ b/Theme/Backend/unit-create.tpl.php @@ -28,7 +28,8 @@ echo $this->getData('nav')->render(); ?>
+ UriFactory::build('Modules/Organization/Theme/Backend/img/org_default.png') :
+ UriFactory::build($value->image->getPath()); ?>">