From c9282c71df149da6db1118aa883d192fff015139 Mon Sep 17 00:00:00 2001 From: Max Pozdeev Date: Wed, 28 Jul 2021 22:56:55 +0300 Subject: [PATCH] * hidden state of all tasks list is saved in settings now --- src/ajax.php | 21 +++++++++++++++++---- src/includes/mytinytodo.js | 11 ++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/ajax.php b/src/ajax.php index ef08172..7d7c691 100644 --- a/src/ajax.php +++ b/src/ajax.php @@ -515,9 +515,16 @@ elseif(isset($_GET['setHideList'])) { check_write_access(); $listId = (int)_post('list'); - $flag = (int)_post('hide'); - $bitwise = ($flag == 0) ? 'taskview & ~4' : 'taskview | 4'; - $db->dq("UPDATE {$db->prefix}lists SET taskview=$bitwise WHERE id=$listId"); + $flag = (int)_post('hide') ? 1 : 0; + if ($listId == -1) { + $opts = Config::requestDomain('alltasks.json'); + $opts['hidden'] = $flag; + Config::saveDomain('alltasks.json', $opts); + } + else { + $bitwise = ($flag == 0) ? 'taskview & ~4' : 'taskview | 4'; + $db->dq("UPDATE {$db->prefix}lists SET taskview=$bitwise WHERE id=$listId"); + } jsonExit(array('total'=>1)); } @@ -898,6 +905,12 @@ function prepareList($row) function prepareAllTasksList() { + //default values + $hidden = 1; + + $opts = Config::requestDomain('alltasks.json'); + if ( isset($opts['hidden']) ) $hidden = (int)$opts['hidden'] ? 1 : 0; + return array( 'id' => -1, 'name' => htmlarray(__('alltasks')), @@ -905,7 +918,7 @@ function prepareAllTasksList() 'published' => 0, 'showCompl' => 1, 'showNotes' => 0, - 'hidden' => 1, + 'hidden' => $hidden, ); } diff --git a/src/includes/mytinytodo.js b/src/includes/mytinytodo.js index 91c679a..c1664f4 100644 --- a/src/includes/mytinytodo.js +++ b/src/includes/mytinytodo.js @@ -683,6 +683,7 @@ var mytinytodo = window.mytinytodo = _mtt = { $.each(res.list, function(i,item) { if ( item.id == -1) { + tabLists._alltasks = item; ti += '
  • '+ ''+item.name+''+ '
  • '; @@ -1357,7 +1358,7 @@ function tabSelect(elementOrId) if(curList.hidden) { curList.hidden = false; - if(curList.id > 0) _mtt.db.request('setHideList', {list:curList.id, hide:0}); + _mtt.db.request('setHideList', {list:curList.id, hide:0}); } flag.tagsChanged = true; cancelTagFilter(0, 1); @@ -2104,6 +2105,7 @@ function cmenuOnListOrderChanged() function cmenuOnListHidden(list) { + if (list.id == -1) return; $('#cmenu_list\\:'+list.id).addClass('mtt-list-hidden'); }; @@ -2233,6 +2235,7 @@ function slmenuOnListSelected(list) function slmenuOnListHidden(list) { + if (list.id == -1) return; $('#slmenucontainer li.list-id-'+list.id).addClass('mtt-list-hidden'); }; @@ -2285,10 +2288,8 @@ function hideList(listId) tabLists.get(listId).hidden = true; - if(listId > 0) { - _mtt.db.request('setHideList', {list:listId, hide:1}); - _mtt.doAction('listHidden', tabLists.get(listId)); - } + _mtt.db.request('setHideList', {list:listId, hide:1}); + _mtt.doAction('listHidden', tabLists.get(listId)); if(listIdToSelect) { tabSelect(listIdToSelect);