From 69fae2cf092032e24074c6ae7f8e705839ee0a70 Mon Sep 17 00:00:00 2001 From: Jacek Pyziak Date: Tue, 25 Feb 2025 20:35:32 +0100 Subject: [PATCH] =?UTF-8?q?Zaktualizuj=20dane=20konfiguracyjne=20FTP=20ora?= =?UTF-8?q?z=20popraw=20logik=C4=99=20wy=C5=9Bwietlania=20zada=C5=84=20do?= =?UTF-8?q?=20przegl=C4=85du=20i=20zada=C5=84=20zbiorczych?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/ftp-kr.json | 4 ++-- .vscode/ftp-kr.sync.cache.json | 12 ++++++------ .vscode/sftp.json | 6 +++--- autoload/controls/class.Tasks.php | 6 ++++-- config.php | 6 +++--- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.vscode/ftp-kr.json b/.vscode/ftp-kr.json index 884dbca..2ab157f 100644 --- a/.vscode/ftp-kr.json +++ b/.vscode/ftp-kr.json @@ -1,7 +1,7 @@ { - "host": "193.177.164.18", + "host": "host700513.hostido.net.pl", "username": "www@crmpro.projectpro.pl", - "password": "fgQxh2Yvbj83JguqUgUr", + "password": "kWaxmSjECY9yfc2HpC9g", "remotePath": "/public_html", "protocol": "ftp", "port": 0, diff --git a/.vscode/ftp-kr.sync.cache.json b/.vscode/ftp-kr.sync.cache.json index b11a120..75421a1 100644 --- a/.vscode/ftp-kr.sync.cache.json +++ b/.vscode/ftp-kr.sync.cache.json @@ -216,20 +216,20 @@ "layout": { "style.css": { "type": "-", - "size": 21680, - "lmtime": 1740255742144, + "size": 21724, + "lmtime": 1740309272875, "modified": false }, "style.css.map": { "type": "-", - "size": 37663, - "lmtime": 1740255742144, + "size": 37760, + "lmtime": 1740309272875, "modified": false }, "style.scss": { "type": "-", - "size": 26252, - "lmtime": 1740255741799, + "size": 26323, + "lmtime": 1740309272397, "modified": false } }, diff --git a/.vscode/sftp.json b/.vscode/sftp.json index 55497df..1457e61 100644 --- a/.vscode/sftp.json +++ b/.vscode/sftp.json @@ -1,10 +1,10 @@ { - "name": "193.177.164.18", - "host": "193.177.164.18", + "name": "host700513.hostido.net.pl", + "host": "host700513.hostido.net.pl", "protocol": "ftp", "port": 21, "username": "www@crmpro.projectpro.pl", - "password": "fgQxh2Yvbj83JguqUgUr", + "password": "kWaxmSjECY9yfc2HpC9g", "remotePath": "/public_html", "uploadOnSave": false, "useTempFile": false, diff --git a/autoload/controls/class.Tasks.php b/autoload/controls/class.Tasks.php index a364fc1..b354fd9 100644 --- a/autoload/controls/class.Tasks.php +++ b/autoload/controls/class.Tasks.php @@ -24,6 +24,8 @@ class Tasks global $user; $show_tasks_closed = \S::get_session( 'tasks_closed' ); + $show_tasks_bulk = \S::get_session( 'tasks_bulk' ); + $show_tasks_to_review = \S::get_session( 'tasks_to_review' ); $open_task_id = \factory\Tasks::get_open_task_id( $user['id'] ); $projects = \S::get( 'projects' ); @@ -47,7 +49,7 @@ class Tasks 'open_task_id' => $open_task_id ] ), 'tasks_to_review' => \Tpl::view( 'tasks/main_view_by_ajax', [ - 'tasks' => \factory\Tasks::get_tasks( 1, $user['id'], $projects, $users ), + 'tasks' => $show_tasks_to_review == 'hide' ? null : \factory\Tasks::get_tasks( 1, $user['id'], $projects, $users ), 'user' => $user, 'statuses' => \factory\Tasks::get_statuses(), 'open_task_id' => $open_task_id @@ -59,7 +61,7 @@ class Tasks 'open_task_id' => $open_task_id ] ), 'tasks_bulk' => \Tpl::view( 'tasks/main_view_by_ajax', [ - 'tasks' => \factory\Tasks::get_tasks( 3, $user['id'], $projects, $users ), + 'tasks' => $show_tasks_bulk == 'hide' ? null : \factory\Tasks::get_tasks( 3, $user['id'], $projects, $users ), 'user' => $user, 'statuses' => \factory\Tasks::get_statuses(), 'open_task_id' => $open_task_id diff --git a/config.php b/config.php index ffff10c..c7bff96 100644 --- a/config.php +++ b/config.php @@ -1,8 +1,8 @@