Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-05 23:47:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop search capa to always allow it

Browse source
This commit is contained in:
the-djmaze 2022-09-08 12:05:37 +02:00
parent 18096cb6ee
commit 2a92122dad
5 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dev/View/User/MailBox/MessageList.js
View file

@ -63,8 +63,6 @@ export class MailMessageList extends AbstractViewRight {
this.newMoveToFolder = !!SettingsGet('NewMoveToFolder'); this.newMoveToFolder = !!SettingsGet('NewMoveToFolder');
this.allowSearch = SettingsCapa('Search');
this.allowSearchAdv = SettingsCapa('SearchAdv');
this.allowDangerousActions = SettingsCapa('DangerousActions'); this.allowDangerousActions = SettingsCapa('DangerousActions');
this.messageList = MessagelistUserStore; this.messageList = MessagelistUserStore;
@ -776,8 +774,7 @@ export class MailMessageList extends AbstractViewRight {
} }
advancedSearchClick() { advancedSearchClick() {
SettingsCapa('SearchAdv') showScreenPopup(AdvancedSearchPopupView, [MessagelistUserStore.mainSearch()]);
&& showScreenPopup(AdvancedSearchPopupView, [MessagelistUserStore.mainSearch()]);
} }
quotaTooltip() { quotaTooltip() {

2
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1178,8 +1178,6 @@ class Actions
'MessageActions' => (bool) $oConfig->Get('capa', 'message_actions', true), 'MessageActions' => (bool) $oConfig->Get('capa', 'message_actions', true),
'OpenPGP' => (bool) $oConfig->Get('security', 'openpgp', false), 'OpenPGP' => (bool) $oConfig->Get('security', 'openpgp', false),
'Quota' => (bool) $oConfig->Get('capa', 'quota', true), 'Quota' => (bool) $oConfig->Get('capa', 'quota', true),
'Search' => (bool) $oConfig->Get('capa', 'search', true),
'SearchAdv' => (bool) $oConfig->Get('capa', 'search', true) && $oConfig->Get('capa', 'search_adv', true),
'Sieve' => false, 'Sieve' => false,
'Themes' => (bool) $oConfig->Get('webmail', 'allow_themes', false), 'Themes' => (bool) $oConfig->Get('webmail', 'allow_themes', false),
'UserBackground' => (bool) $oConfig->Get('webmail', 'allow_user_background', false) 'UserBackground' => (bool) $oConfig->Get('webmail', 'allow_user_background', false)

2
snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -209,8 +209,6 @@ class Application extends \RainLoop\Config\AbstractConfig
'capa' => array( 'capa' => array(
'quota' => array(true), 'quota' => array(true),
'search' => array(true),
'search_adv' => array(true),
'dangerous_actions' => array(true), 'dangerous_actions' => array(true),
'message_actions' => array(true), 'message_actions' => array(true),
'attachments_actions' => array(true) 'attachments_actions' => array(true)

2
snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
View file

@ -13,8 +13,6 @@ class Capa
const ADDITIONAL_ACCOUNTS = 'AdditionalAccounts'; const ADDITIONAL_ACCOUNTS = 'AdditionalAccounts';
const IDENTITIES = 'Identities'; const IDENTITIES = 'Identities';
const CONTACTS = 'Contacts'; const CONTACTS = 'Contacts';
const SEARCH = 'Search';
const SEARCH_ADV = 'SearchAdv';
const QUOTA = 'Quota'; const QUOTA = 'Quota';
const MESSAGE_ACTIONS = 'MessageActions'; const MESSAGE_ACTIONS = 'MessageActions';
const ATTACHMENTS_ACTIONS = 'AttachmentsActions'; const ATTACHMENTS_ACTIONS = 'AttachmentsActions';

4
snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
View file

@ -100,13 +100,11 @@
<div class="messageList g-ui-user-select-none" data-bind="css: {'hideMessageListCheckbox': !useCheckboxesInList() }"> <div class="messageList g-ui-user-select-none" data-bind="css: {'hideMessageListCheckbox': !useCheckboxesInList() }">
<div class="second-toolbar thm-message-list-top-toolbar"> <div class="second-toolbar thm-message-list-top-toolbar">
<i class="checkboxCheckAll fontastic" data-bind="text: checkAll() ? (isIncompleteChecked() ? '▣' : '☑') : '☐'"></i> <i class="checkboxCheckAll fontastic" data-bind="text: checkAll() ? (isIncompleteChecked() ? '▣' : '☑') : '☐'"></i>
<!-- ko if: allowSearch -->
<div class="search-input-wrp"> <div class="search-input-wrp">
<input type="search" class="inputSearch" tabindex="-1" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="textInput: inputSearch, hasfocus: focusSearch"> <input type="search" class="inputSearch" tabindex="-1" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="textInput: inputSearch, hasfocus: focusSearch">
<a class="closeSearch" data-bind="click: cancelSearch, visible: messageListSearchDesc()">×</a> <a class="closeSearch" data-bind="click: cancelSearch, visible: messageListSearchDesc()">×</a>
</div> </div>
<a class="btn buttonMoreSearch" data-bind="visible: allowSearchAdv, click: advancedSearchClick">▼</a> <a class="btn buttonMoreSearch" data-bind="click: advancedSearchClick">▼</a>
<!-- /ko -->
</div> </div>
<div class="b-content" data-bind="initDom: dragOverBodyArea"> <div class="b-content" data-bind="initDom: dragOverBodyArea">
<div class="listThreadUidDesc" data-bind="visible: messageList.threadUid(), click: cancelThreadUid" <div class="listThreadUidDesc" data-bind="visible: messageList.threadUid(), click: cancelThreadUid"