Revize 2190aaa4

Re #7607 vyhledávání pouze pro přihlášené, upravení menu

app/AdminModule/component/User/UserEditForm.php

@@ -175 +175 @@
      */
     private function getRoles()
     {
-        return $this->roleRepository->findAll()->fetchPairs(RoleRepository::COLUMN_ID, RoleRepository::COLUMN_NAME);
+        return $this->roleRepository->getRolesForSelect();
     }
 }
 

app/AdminModule/component/User/UserGrid.php

@@ -4 +4 @@
 namespace App\AdminModule\Components;
 
 
+use App\Model\Repository\BookRepository;
+use App\Model\Repository\RoleRepository;
 use App\Model\Repository\UserRepository;
+use App\Model\Repository\UserRoleRepository;
 use App\Utils\DataGrid\DataGrid;
+use Nette\Database\Table\ActiveRow;
+use Nette\Database\Table\Selection;
 use Ublaboo\DataGrid\Exception\DataGridException;
 
 class UserGrid extends DataGrid
@@ -14 +19 @@
      * @var UserRepository
      */
     private $userRepository;
+    /**
+     * @var RoleRepository
+     */
+    private $roleRepository;
 
-    public function __construct(UserRepository $userRepository)
+    public function __construct(UserRepository $userRepository,
+                                RoleRepository $roleRepository)
     {
         $this->userRepository = $userRepository;
+        $this->roleRepository = $roleRepository;
 
         parent::__construct();
     }
@@ -46 +57 @@
         $this->addColumnNumber(UserRepository::COLUMN_ID, 'ID')->setDefaultHide(TRUE);
         $this->addColumnText(UserRepository::COLUMN_USERNAME, 'Uživatel');
         $this->addColumnText(UserRepository::COLUMN_LOGIN, 'Login');
+        $this->addColumnText(RoleRepository::COLUMN_NAME, 'Role')
+            ->setRenderer(function (ActiveRow $activeRow)
+            {
+                try
+                {
+                    $userRoleRow = $activeRow->related(UserRoleRepository::TABLE_NAME)->fetch();
+                    $roleRow = $userRoleRow->ref(RoleRepository::TABLE_NAME);
+
+                    return $roleRow->{RoleRepository::COLUMN_NAME};
+
+                } catch (\Exception $ex)
+                {
+                    \Tracy\Debugger::log($ex->getMessage(), 'user-grid');
+                    return "not found";
+                }
+            });
         $this->addColumnText(UserRepository::COLUMN_EMAIL, 'Email');
 
         // Definice filtrů
         $this->addFilterText(UserRepository::COLUMN_USERNAME, 'Uživatel');
         $this->addFilterText(UserRepository::COLUMN_LOGIN, 'Login');
+        $this->addFilterSelect(RoleRepository::COLUMN_NAME, 'Role', ['' => 'all'] + $this->roleRepository->getRolesForSelect())
+            ->setCondition(function (Selection $selection, $value)
+            {
+                $selection->where(':role.role_id', $value);
+            });
         $this->addFilterText(UserRepository::COLUMN_EMAIL, 'Email');
 
         // Akce

app/AdminModule/presenters/BookPresenter.php

@@ -8 +8 @@
 use App\Enum\EFlashMessage;
 use App\Model\Repository\BookRepository;
 
-class BookPresenter extends BaseUserPresenter
+class BookPresenter extends BaseAdminPresenter
 {
     /**
      * @var IBookGridFactory

app/AdminModule/presenters/BookTypePresenter.php

@@ -9 +9 @@
 use App\Model\Repository\BookTypeRepository;
 use const Couchbase\ENCODER_FORMAT_IGBINARY;
 
-class BookTypePresenter extends BaseUserPresenter
+class BookTypePresenter extends BaseAdminPresenter
 {
 
     /**

app/AdminModule/presenters/MuseumPresenter.php

@@ -8 +8 @@
 use App\Enum\EFlashMessage;
 use App\Model\Repository\MuseumRepository;
 
-class MuseumPresenter extends BaseUserPresenter
+class MuseumPresenter extends BaseAdminPresenter
 {
     /**
      * @var IMuseumGridFactory

app/AdminModule/presenters/ObjectPresenter.php

@@ -8 +8 @@
 use App\Enum\EFlashMessage;
 use App\Model\Repository\ObjectTypeRepository;
 
-class ObjectPresenter extends BaseUserPresenter
+class ObjectPresenter extends BaseAdminPresenter
 {
     /** @var ObjectTypeRepository */
     private $objectTypeRepository;

app/AdminModule/presenters/OriginPresenter.php

@@ -9 +9 @@
 use App\Enum\EFlashMessage;
 use App\Model\Repository\OriginRepository;
 
-class OriginPresenter extends BaseUserPresenter
+class OriginPresenter extends BaseAdminPresenter
 {
     /**
      * @var IOriginGridFactory

app/AdminModule/presenters/SurfacePresenter.php

@@ -8 +8 @@
 use App\Enum\EFlashMessage;
 use App\Model\Repository\SurfaceTypeRepository;
 
-class SurfacePresenter extends BaseUserPresenter
+class SurfacePresenter extends BaseAdminPresenter
 {
     /** @var ISurfaceTypeGridFactory */
     private $surfaceTypeGridFactory;

app/AdminModule/presenters/TransliterationPresenter.php

@@ -12 +12 @@
 use App\FrontModule\Components\IKeyboard;
 use App\Model\Repository\TransliterationRepository;
 
-class TransliterationPresenter extends BaseUserPresenter
+class TransliterationPresenter extends BaseAdminPresenter
 {
     /**
      * @var ITransliterationGridFactory

app/AdminModule/presenters/TransportPresenter.php

@@ -11 +11 @@
 use App\Model\TransportModel;
 use App\Utils\TextParser;
 
-class TransportPresenter extends BaseUserPresenter
+class TransportPresenter extends BaseAdminPresenter
 {
     /** @var IImportFormFactory */
     private $importFormFactory;

app/FrontModule/component/Transliteration/TransliterationView.latte

@@ -4 +4 @@
 <div>
 
     <div>
-        {if isset($transliteration->id_book) && !empty($transliteration->id_book)}
-            <a href="{$presenter->link(':Admin:Book:edit', ['id' => $transliteration->id_book])}">edit book</a>
-        {/if}
-        {if isset($transliteration->id) && !empty($transliteration->id)}
-            <a href="{$presenter->link(':Admin:Transliteration:edit#transliteration-info', ['id' => $transliteration->id])}">edit
-                transliteration info</a>
+        {if $user->isInRole(\App\Enum\EUserRole::ADMIN)}
+            {if isset($transliteration->id_book) && !empty($transliteration->id_book)}
+                <a href="{$presenter->link(':Admin:Book:edit', ['id' => $transliteration->id_book])}">edit book</a>
+            {/if}
+            |
+            {if isset($transliteration->id) && !empty($transliteration->id)}
+                <a href="{$presenter->link(':Admin:Transliteration:edit#transliteration-info', ['id' => $transliteration->id])}">edit
+                    transliteration info</a>
+            {/if}
         {/if}
     </div>
 
@@ -88 +91 @@
     </div>
 
 
-    {if isset($transliteration->id) && !empty($transliteration->id)}
-        <a href="{$presenter->link(':Admin:Transliteration:edit#transliteration-data', ['id' => $transliteration->id])}">edit</a>
+    {if $user->isInRole(\App\Enum\EUserRole::ADMIN)}
+        {if isset($transliteration->id) && !empty($transliteration->id)}
+            <a href="{$presenter->link(':Admin:Transliteration:edit#transliteration-data', ['id' => $transliteration->id])}">edit</a>
+        {/if}
     {/if}
 
     <div class="container-fluid">

app/FrontModule/presenters/TransliterationPresenter.php

@@ -4 +4 @@
 
 
 
+use App\AdminModule\Presenters\BaseUserPresenter;
 use App\FrontModule\Components\IKeyboard;
 use App\FrontModule\Components\ITransliterationSearchFormFactory;
 use App\FrontModule\Components\ITransliterationSearchResultListFactory;
@@ -13 +14 @@
 use App\Model\Repository\RevHistoryRepository;
 use App\Model\Repository\TransliterationRepository;
 use App\Model\TransliterationSearchModel;
-use Nette\Application\UI\Presenter;
 
-class TransliterationPresenter extends Presenter
+class TransliterationPresenter extends BaseUserPresenter
 {
     /** @var ITransliterationSearchFormFactory */
     private $transliterationSearchFormFactory;

app/model/repository/RoleRepository.php

@@ -16 +16 @@
     /** Sloupečky tabulky */
     const COLUMN_ID = 'id';
     const COLUMN_NAME = 'name';
+
+    /**
+     * Vrací role uživatele pro selectboxy
+     *
+     * @return array
+     */
+    public function getRolesForSelect()
+    {
+        return $this->findAll()->fetchPairs(RoleRepository::COLUMN_ID, RoleRepository::COLUMN_NAME);
+    }
 }

app/templates/@menu.latte

@@ -1 +1 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-primary" style="background-color: #003366 !important;">
     <ul class="navbar-nav mr-auto">
-        <li class="nav-item">
-            <a n:class="nav-link, $presenter->isLinkCurrent(':Front:Transliteration:*') ? active" n:href=":Front:Transliteration:search">Search & edit texts</a>
-        </li>
+        {if $user->loggedIn && ($user->isInRole(\App\Enum\EUserRole::ADMIN) || $user->isInRole(\App\Enum\EUserRole::USER))}
+            <li class="nav-item">
+                <a n:class="nav-link, $presenter->isLinkCurrent(':Front:Transliteration:*') ? active" n:href=":Front:Transliteration:search">Search
+                    & edit texts</a>
+            </li>
+        {/if}
         <li class="nav-item">
             <a class="nav-link" href="/utf/sj.php">Search dictionary</a>
         </li>
-        <li class="nav-item">
-            <a n:class="nav-link, $presenter->isLinkCurrent(':Front:Catalogue:*') ? active" n:href=":Front:Catalogue:default">Text catalogue</a>
-        </li>
+        {if $user->loggedIn && ($user->isInRole(\App\Enum\EUserRole::ADMIN) || $user->isInRole(\App\Enum\EUserRole::USER))}
+            <li class="nav-item">
+                <a n:class="nav-link, $presenter->isLinkCurrent(':Front:Catalogue:*') ? active" n:href=":Front:Catalogue:default">Text
+                    catalogue</a>
+            </li>
+        {/if}
         <li class="nav-item">
             <a class="nav-link" href="/utf/signs.html">Catalogue of cuneiform signs</a>
         </li>
         <li class="nav-item">
-            <a n:class="nav-link, $presenter->isLinkCurrent(':Front:Contact:default') ? active" n:href=":Front:Contact:default">Contact & members</a>
-        </li>
-        <li class="nav-item">
-            <a n:class="nav-link, $presenter->isLinkCurrent(':Admin:Transliteration:new') ? active" n:href=":Admin:Transliteration:new">Input new text</a>
+            <a n:class="nav-link, $presenter->isLinkCurrent(':Front:Contact:default') ? active" n:href=":Front:Contact:default">Contact
+                & members</a>
         </li>
+        {if $user->loggedIn && $user->isInRole(\App\Enum\EUserRole::ADMIN)}
+            <li class="nav-item">
+                <a n:class="nav-link, $presenter->isLinkCurrent(':Admin:Transliteration:new') ? active" n:href=":Admin:Transliteration:new">Input
+                    new text</a>
+            </li>
+        {/if}
         <li class="nav-item">
             <a class="nav-link" href="/multidic">Dictionary</a>
         </li>
-        {if $user->loggedIn && ($user->isInRole(\App\Enum\EUserRole::ADMIN) || $user->isInRole(\App\Enum\EUserRole::USER))}
+        {if $user->loggedIn && $user->isInRole(\App\Enum\EUserRole::ADMIN)}
             <li class="nav-item">
                 <a n:class="nav-link, strpos($presenter->getRequest()->getPresenterName(), 'Admin') !== FALSE ? active" n:href=":Admin:Default:">Admin</a>
             </li>

old/html/multidic/app/webroot/classes/db.php

@@ -10 +10 @@
 
 class DB_Sql
 {
-    var $Host = "Filek.cz";
-    var $Database = "aswi-dictionary";
-    var $User = "dbowner";
-    var $Password = "db486ex12";
+    var $Host = "localhost";
+    var $Database = "web_klinopis_dictionary";
+    var $User = "klinopis";
+    var $Password = "";
 
     /** @var mysqli_result */
     var $result = null;

old/html/utf/dbconfig.php

@@ -2 +2 @@
 
 define('DB_HOST', 'localhost');
 define('DB_NAME', 'web_klinopis_klinopis');
-define('DB_USER', 'dbowner');
+define('DB_USER', 'klinopis');
 define('DB_PASSWORD', '');