Skip to content

add limit filemanager #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Serbulenko wants to merge 1 commit into
base: 3.0.4.5
Choose a base branch
from
Open

add limit filemanager #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions upload/admin/controller/common/filemanager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ public function index() {
// Get total number of files and directories
$image_total = count($images);

$limit = $this->config->get('config_limit_filemanager') ? $this->config->get('config_limit_filemanager') : 16;
// Split the array based on current page number and max number of items per page of 10
$images = array_splice($images, ($page - 1) * 16, 16);
$images = array_splice($images, ($page - 1) * $limit, $limit);

foreach ($images as $image) {
$name = $this->basename_fixed($image);
Expand Down Expand Up @@ -192,7 +193,7 @@ public function index() {
$pagination = new Pagination();
$pagination->total = $image_total;
$pagination->page = $page;
$pagination->limit = 16;
$pagination->limit = $limit;
$pagination->url = $this->url->link('common/filemanager', 'user_token=' . $this->session->data['user_token'] . $url . '&page={page}', true);

$data['pagination'] = $pagination->render();
Expand Down
18 changes: 18 additions & 0 deletions upload/admin/controller/setting/setting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@ public function index() {
$data['error_limit_autocomplete'] = '';
}

if (isset($this->error['limit_filemanager'])) {
$data['error_limit_filemanager'] = $this->error['limit_filemanager'];
} else {
$data['error_limit_filemanager'] = '';
}

if (isset($this->error['encryption'])) {
$data['error_encryption'] = $this->error['encryption'];
} else {
Expand Down Expand Up @@ -440,6 +446,14 @@ public function index() {
$data['config_limit_autocomplete'] = 5;
}

if (isset($this->request->post['config_limit_filemanager'])) {
$data['config_limit_filemanager'] = $this->request->post['config_limit_filemanager'];
} elseif ($this->config->get('config_limit_filemanager')) {
$data['config_limit_filemanager'] = $this->config->get('config_limit_filemanager');
} else {
$data['config_limit_filemanager'] = 16;
}

if (isset($this->request->post['config_product_count'])) {
$data['config_product_count'] = $this->request->post['config_product_count'];
} else {
Expand Down Expand Up @@ -1070,6 +1084,10 @@ protected function validate() {
$this->error['limit_autocomplete'] = $this->language->get('error_limit');
}

if (!$this->request->post['config_limit_filemanager']) {
$this->error['limit_filemanager'] = $this->language->get('error_limit');
}

if ($this->request->post['config_login_attempts'] < 1) {
$this->error['login_attempts'] = $this->language->get('error_login_attempts');
}
Expand Down
2 changes: 2 additions & 0 deletions upload/admin/language/en-gb/setting/setting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
$_['entry_weight_class'] = 'Weight Class';
$_['entry_limit_admin'] = 'Default Items Per Page (Admin)';
$_['entry_limit_autocomplete'] = 'Default Items for search with autocomplete Page (Admin)';
$_['entry_limit_filemanager'] = 'Default Items Per Page (Filemanager)';
$_['entry_product_count'] = 'Category Product Count';
$_['entry_review'] = 'Allow Reviews';
$_['entry_review_guest'] = 'Allow Guest Reviews';
Expand Down Expand Up @@ -147,6 +148,7 @@
$_['help_currency_auto'] = 'Set your store to automatically update currencies daily.';
$_['help_limit_admin'] = 'Determines how many admin items are shown per page (orders, customers, etc).';
$_['help_limit_autocomplete'] = 'Determines how many items are shown for search with autocomplete (attributes, options, filters, products, etc).';
$_['help_limit_filemanager'] = 'Determines how many items are shown per page in the file manager.';
$_['help_product_count'] = 'Show the number of products inside the subcategories in the storefront header category menu. Be warned, this will cause an extreme performance hit for stores with a lot of subcategories!';
$_['help_review'] = 'Enable/Disable new review entry and display of existing reviews.';
$_['help_review_guest'] = 'Allow guests to post reviews.';
Expand Down
2 changes: 2 additions & 0 deletions upload/admin/language/ru-ru/setting/setting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
$_['entry_weight_class'] = 'Единица измерения веса';
$_['entry_limit_admin'] = 'Лимит элементов (Админ)';
$_['entry_limit_autocomplete'] = 'Элементов при поиске с автодополнением';
$_['entry_limit_filemanager'] = 'Элементов в файловом менеджере';
$_['entry_product_count'] = 'Подсчет товаров в категории';
$_['entry_review'] = 'Разрешить отзывы';
$_['entry_review_guest'] = 'Разрешить отзывы гостям';
Expand Down Expand Up @@ -149,6 +150,7 @@
$_['help_currency_auto'] = 'Задать ежедневное автоматическое обновление валют.';
$_['help_limit_admin'] = 'Количество отображаемых на странице элементов (товары, категории, заказы, покупатели и т.п.)';
$_['help_limit_autocomplete'] = 'Количество отображаемых элементов при поиске с автодополнением (атрибуты, опции, фильтры...) ДЛЯ АДМИНИСТРАТОРА';
$_['help_limit_filemanager'] = 'Количество отображаемых элементов в файловом менеджере';
$_['help_product_count'] = 'Показывать количество товаров в категории. Включение этой опции может привести к увеличению времени загрузки страниц для магазинов с большим количеством товаров!</b>';
$_['help_review'] = 'Включает/выключает добавление новых отзывов и отображение существующих.';
$_['help_review_guest'] = 'Разрешить гостям оставлять отзывы.';
Expand Down
8 changes: 8 additions & 0 deletions upload/admin/view/template/setting/setting.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,14 @@
<div class="text-danger">{{ error_limit_autocomplete }}</div>
{% endif %} </div>
</div>
<div class="form-group required">
<label class="col-sm-2 control-label" for="input-filemanager-limit"><span data-toggle="tooltip" title="{{ help_limit_filemanager }}">{{ entry_limit_filemanager }}</span></label>
<div class="col-sm-10">
<input type="text" name="config_limit_filemanager" value="{{ config_limit_filemanager }}" placeholder="{{ entry_limit_filemanager }}" id="input-filemanager-limit" class="form-control" />
{% if error_limit_filemanager %}
<div class="text-danger">{{ error_limit_filemanager }}</div>
{% endif %} </div>
</div>
</fieldset>
<fieldset>
<legend>{{ text_review }}</legend>
Expand Down
1 change: 1 addition & 0 deletions upload/install/opencart.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3333,6 +3333,7 @@ INSERT INTO `oc_setting` (`store_id`, `code`, `key`, `value`, `serialized`) VALU
(0, 'config', 'config_product_count', '0', 0),
(0, 'config', 'config_limit_admin', '25', 0),
(0, 'config', 'config_limit_autocomplete', '5', 0),
(0, 'config', 'config_limit_filemanager', '16', 0),
(0, 'config', 'config_review_status', '1', 0),
(0, 'config', 'config_review_guest', '1', 0),
(0, 'config', 'config_voucher_min', '1', 0),
Expand Down