From 23a1d42c8c401558a1ee16843d0c01947a31c01c Mon Sep 17 00:00:00 2001
From: Artem Vasilev <kern.usr@gmial.com>
Date: Sun, 3 Mar 2024 23:21:53 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../language/ru-RU/ru-RU.com_oauthserver.ini  |  4 +-
 .../src/Controller/ClientsController.php      | 34 ++++++++++++++
 .../src/View/Clients/HtmlView.php             |  8 ++--
 .../administrator/tmpl/clients/default.php    | 45 ++++++++++++-------
 4 files changed, 72 insertions(+), 19 deletions(-)
 create mode 100644 com_oauthserver/administrator/src/Controller/ClientsController.php

diff --git a/com_oauthserver/administrator/language/ru-RU/ru-RU.com_oauthserver.ini b/com_oauthserver/administrator/language/ru-RU/ru-RU.com_oauthserver.ini
index 3fa3704..8f93213 100644
--- a/com_oauthserver/administrator/language/ru-RU/ru-RU.com_oauthserver.ini
+++ b/com_oauthserver/administrator/language/ru-RU/ru-RU.com_oauthserver.ini
@@ -21,4 +21,6 @@ COM_OAUTHSERVER_CLIENTS_HEADING_IDENTIFIER = "ID клиента"
 COM_OAUTHSERVER_CLIENTS_HEADING_SECRET = "Ключ"
 COM_OAUTHSERVER_CLIENTS_HEADING_PUBLIC = "Публичный"
 
-COM_OAUTHSERVER_SAVE_AND_RESET = "Сохранить и сбросить"
\ No newline at end of file
+COM_OAUTHSERVER_SAVE_AND_RESET = "Сохранить и сбросить"
+
+COM_OAUTHSERVER_CLIENTS = "Клиенты"
\ No newline at end of file
diff --git a/com_oauthserver/administrator/src/Controller/ClientsController.php b/com_oauthserver/administrator/src/Controller/ClientsController.php
new file mode 100644
index 0000000..503d1aa
--- /dev/null
+++ b/com_oauthserver/administrator/src/Controller/ClientsController.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Webmasterskaya\Component\OauthServer\Administrator\Controller;
+
+use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
+class ClientsController extends AdminController
+{
+    /**
+     * The prefix to use with controller messages.
+     *
+     * @var    string
+     * @since  1.6
+     */
+    protected $text_prefix = 'COM_OAUTHSERVER_CLIENT';
+
+    /**
+     * Method to get a model object, loading it if required.
+     *
+     * @param   string  $name    The model name. Optional.
+     * @param   string  $prefix  The class prefix. Optional.
+     * @param   array   $config  Configuration array for model. Optional.
+     *
+     * @return  \Joomla\CMS\MVC\Model\BaseDatabaseModel  The model.
+     *
+     * @since   1.6
+     */
+    public function getModel($name = 'Client', $prefix = 'Administrator', $config = array('ignore_request' => true)): BaseDatabaseModel
+    {
+        return parent::getModel($name, $prefix, $config);
+    }
+
+}
\ No newline at end of file
diff --git a/com_oauthserver/administrator/src/View/Clients/HtmlView.php b/com_oauthserver/administrator/src/View/Clients/HtmlView.php
index 0914812..dab70c3 100644
--- a/com_oauthserver/administrator/src/View/Clients/HtmlView.php
+++ b/com_oauthserver/administrator/src/View/Clients/HtmlView.php
@@ -129,9 +129,11 @@ class HtmlView extends \Joomla\CMS\MVC\View\HtmlView
             $toolbar->addNew('client.add');
         }
 
-        // Add actions dropdown
-        if (!$this->isEmptyState) {
-            // TODO: Что мы тут в дропдаун пихаем?
+        if ($canDo->get('core.delete')) {
+            $toolbar->delete('clients.delete')
+                ->text('JTOOLBAR_DELETE')
+                ->message('JGLOBAL_CONFIRM_DELETE')
+                ->listCheck(true);
         }
 
         // Add preferences button
diff --git a/com_oauthserver/administrator/tmpl/clients/default.php b/com_oauthserver/administrator/tmpl/clients/default.php
index 19cc05d..9074ee3 100644
--- a/com_oauthserver/administrator/tmpl/clients/default.php
+++ b/com_oauthserver/administrator/tmpl/clients/default.php
@@ -49,16 +49,16 @@ $listDirn = $this->escape($this->state->get('list.direction'));
                             <td class="w-1 text-center">
                                 <?php echo HTMLHelper::_('grid.checkall'); ?>
                             </td>
-                            <th scope="col">
+                            <th scope="col" class="w-15">
                                 <?php echo HTMLHelper::_('searchtools.sort', 'COM_OAUTHSERVER_CLIENTS_HEADING_NAME', 'client.name', $listDirn, $listOrder); ?>
                             </th>
-                            <th scope="col">
+                            <th scope="col" class="w-30 col-4">
                                 <?php echo Text::_('COM_OAUTHSERVER_CLIENTS_HEADING_IDENTIFIER'); ?>
                             </th>
-                            <th scope="col">
+                            <th scope="col" class="w-30 col-4">
                                 <?php echo Text::_('COM_OAUTHSERVER_CLIENTS_HEADING_SECRET'); ?>
                             </th>
-                            <th scope="col">
+                            <th scope="col" class="w-5">
                                 <?php echo HTMLHelper::_('searchtools.sort', 'COM_OAUTHSERVER_CLIENTS_HEADING_PUBLIC', 'client.public', $listDirn, $listOrder); ?>
                             </th>
                             <th scope="col" class="w-5 d-none d-md-table-cell">
@@ -74,22 +74,37 @@ $listDirn = $this->escape($this->state->get('list.direction'));
                             $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || is_null($item->checked_out);
                             $canChange = $user->authorise('core.edit.state', 'com_oauthserver.clients') && $canCheckin; ?>
                             <tr class="row<?php echo $i % 2; ?>">
-                                <td class="text-center">
+                                <td class="w-1 text-center">
                                     <?php echo HTMLHelper::_('grid.id', $i, $item->id, false, 'cid', 'cb', $item->name); ?>
                                 </td>
-                                <td class="small text-start">
-                                    <?php echo $item->name; ?>
+                                <th scope="row" class="has-context">
+                                    <div>
+                                        <?php if ($item->checked_out) : ?>
+                                            <?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
+                                        <?php endif; ?>
+                                        <?php if ($canEdit) : ?>
+                                            <a href="<?php echo Route::_('index.php?option=com_oauthserver&task=client.edit&id=' . (int)$item->id); ?>"
+                                               title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape($item->name); ?>">
+                                                <?php echo $this->escape($item->name); ?></a>
+                                        <?php else : ?>
+                                            <?php echo $this->escape($item->name); ?>
+                                        <?php endif; ?>
+                                    </div>
+                                </th>
+                                <td class="d-none d-md-table-cell">
+                                    <code>
+                                        <?php echo $item->identifier; ?>
+                                    </code>
                                 </td>
-                                <td class="small text-center d-none d-md-table-cell">
-                                    <?php echo $item->identifier; ?>
+                                <td class="d-none d-md-table-cell">
+                                    <code>
+                                        <?php echo !empty($item->secret) ? substr($item->secret, 0, 29) . '...' : ''; ?>
+                                    </code>
                                 </td>
-                                <td class="small d-none d-md-table-cell">
-                                    <?php echo $item->secret; ?>
+                                <td class="d-none d-md-table-cell">
+                                    <?php echo Text::_((bool)$item->public ? 'JYES' : 'JNO'); ?>
                                 </td>
-                                <td class="small d-none d-md-table-cell">
-                                    <?php echo Text::_((bool) $item->public ? 'JYES' : 'JNO'); ?>
-                                </td>
-                                <td class="small text-center">
+                                <td class="w-1 text-center">
                                     <?php echo $item->id; ?>
                                 </td>
                             </tr>