浏览代码

Models\Manager: Add access to the repository property

Visman 1 年之前
父节点
当前提交
b57a66f0cf

+ 0 - 5
app/Models/Category/Categories.php

@@ -41,11 +41,6 @@ class Categories extends Manager
         return $this;
     }
 
-    public function getList(): array
-    {
-        return $this->repository;
-    }
-
     public function set($key, $value): Manager
     {
         if (! isset($value['cat_name'], $value['disp_position'])) {

+ 0 - 5
app/Models/Group/Groups.php

@@ -33,11 +33,6 @@ class Groups extends Manager
         return $this->c->GroupModel->setModelAttrs($attrs);
     }
 
-    public function getList(): array
-    {
-        return $this->repository;
-    }
-
     /**
      * Загрузка списка групп
      */

+ 1 - 1
app/Models/Manager.php

@@ -50,7 +50,7 @@ class Manager
         $x = \ord($name);
 
         if ($x > 90 || $x < 65) {
-            return null;
+            return 'repository' === $name ? $this->repository : null;
         } else {
             $key = $this->cKey . '/' . \lcfirst($name);
 

+ 1 - 1
app/Models/Pages/Admin/Categories.php

@@ -85,7 +85,7 @@ class Categories extends Admin
             ],
         ];
 
-        foreach ($this->c->categories->getList() as $key => $row) {
+        foreach ($this->c->categories->repository as $key => $row) {
             $fields = [];
             $fields["form[{$key}][cat_name]"] = [
                 'class'     => ['name', 'category'],

+ 1 - 1
app/Models/Pages/Admin/Forums.php

@@ -24,7 +24,7 @@ class Forums extends Admin
     protected function calcList(Forum $forum): void
     {
         $cid        = null;
-        $categories = $this->c->categories->getList();
+        $categories = $this->c->categories->repository;
         $options    = [
             ['', __('Not selected')],
         ];

+ 1 - 1
app/Models/Pages/Admin/Groups.php

@@ -33,7 +33,7 @@ class Groups extends Admin
         $notForNew     = [FORK_GROUP_ADMIN];
         $notForDefault = [FORK_GROUP_ADMIN, FORK_GROUP_MOD, FORK_GROUP_GUEST];
 
-        foreach ($this->c->groups->getList() as $key => $group) {
+        foreach ($this->c->groups->repository as $key => $group) {
             $groupsList[$key] = [$group->g_title, $group->linkEdit, $group->linkDelete];
 
             if (! \in_array($group->g_id, $notForNew, true)) {

+ 1 - 1
app/Models/Pages/Admin/Providers.php

@@ -92,7 +92,7 @@ class Providers extends Admin
             ],
         ];
 
-        foreach ($this->c->providers->init()->list() as $provider) {
+        foreach ($this->c->providers->init()->repository as $provider) {
             $fields = [];
             $fields["name-{$provider->name}"] = [
                 'class'   => ['name', 'provider'],

+ 1 - 1
app/Models/Pages/Admin/Users/Action.php

@@ -220,7 +220,7 @@ class Action extends Users
     {
         $list = [];
 
-        foreach ($this->c->groups->getList() as $id => $group) {
+        foreach ($this->c->groups->repository as $id => $group) {
                 $list[$id] = $group->g_title;
         }
 

+ 1 - 1
app/Models/Pages/Admin/Users/View.php

@@ -27,7 +27,7 @@ class View extends Users
             0  => __('Unverified users'),
         ];
 
-        foreach ($this->c->groups->getList() as $group) {
+        foreach ($this->c->groups->repository as $group) {
             if (! $group->groupGuest) {
                 $groups[$group->g_id] = $group->g_title;
             }

+ 1 - 1
app/Models/Pages/Userlist.php

@@ -27,7 +27,7 @@ class Userlist extends Page
             'all' => __('All users'),
         ];
 
-        foreach ($this->c->groups->getList() as $group) {
+        foreach ($this->c->groups->repository as $group) {
             if (! $group->groupGuest) {
                 $list[$group->g_id] = $group->g_title;
             }

+ 0 - 8
app/Models/Provider/Providers.php

@@ -83,14 +83,6 @@ class Providers extends Manager
         return $driver;
     }
 
-    /**
-     * Возращает список созданных провайдеров
-     */
-    public function list(): array
-    {
-        return $this->repository;
-    }
-
     /**
      * Возращает список имён активных провайдеров
      */