Skip to content
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

add new sort order, and a way to go back to old order #1740

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

add new sort order, and a way to go back to old order #1740

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 features/cerberusweb.core/api/profiles/widgets/ticket/conversation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private function _showConversation(Model_ProfileWidget $model, $context, $contex
$mail_reply_format = DAO_WorkerPref::get($active_worker->id, 'mail_reply_format', '');

if($mail_always_read_all) {
$display_options['expand_all'] = 1;
$display_options['expand_all'] = (int) $mail_always_read_all;
} else if(array_key_exists('expand_all', $_POST)) {
$display_options['expand_all'] = DevblocksPlatform::importGPC($_POST['expand_all'], 'bit', 0);
}
Expand Down Expand Up @@ -299,7 +299,8 @@ private function _renderTimeline(array $convo_timeline, array $display_options=[
[$this, '_sortTimeline']
);

if($display_options['expand_all'] ?? 0) {
$expand_all = $display_options['expand_all'] ?? 0;
if($expand_all === 1) {
$convo_timeline = array_reverse($convo_timeline, true);
}

Expand Down
10 changes: 10 additions & 0 deletions features/cerberusweb.core/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5404,11 +5404,21 @@ For example: *receipt*</seg>
<seg>Always show plaintext messages (disable HTML)</seg>
</tuv>
</tu>
<tu tuid="preferences.account.mail.readall.default">
<tuv xml:lang="en_US">
<seg>Do not expand messages</seg>
</tuv>
</tu>
<tu tuid="preferences.account.mail.readall">
<tuv xml:lang="en_US">
<seg>Always use 'read all' mode (expand messages and sort chronologically)</seg>
</tuv>
</tu>
<tu tuid="preferences.account.mail.readall.reverse">
<tuv xml:lang="en_US">
<seg>Always use 'read all' mode (expand messages and sort newest first)</seg>
</tuv>
</tu>
<tu tuid="preferences.account.mail.reply_textbox_size">
<tuv xml:lang="en_US">
<seg>While replying:</seg>
Expand Down
4 changes: 3 additions & 1 deletion features/cerberusweb.core/templates/internal/profiles/tabs/worker/settings/tabs/mail.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
<b>{'preferences.account.mail.display'|devblocks_translate}</b>
<div style="margin:0px 0px 10px 10px;">
<label><input type="checkbox" name="mail_disable_html_display" value="1" {if $prefs.mail_disable_html_display}checked{/if}> {'preferences.account.mail.display.disable_html'|devblocks_translate}</label><br>
<label><input type="checkbox" name="mail_always_read_all" value="1" {if $prefs.mail_always_read_all}checked{/if}> {'preferences.account.mail.readall'|devblocks_translate}</label><br>
<label><input type="radio" name="mail_always_read_all" value="0" {if not $prefs.mail_always_read_all || $prefs.mail_always_read_all === '0'}checked{/if}> {'preferences.account.mail.readall.default'|devblocks_translate}</label><br>
<label><input type="radio" name="mail_always_read_all" value="1" {if $prefs.mail_always_read_all === '1'}checked{/if}> {'preferences.account.mail.readall'|devblocks_translate}</label><br>
<label><input type="radio" name="mail_always_read_all" value="2" {if $prefs.mail_always_read_all === '2'}checked{/if}> {'preferences.account.mail.readall.reverse'|devblocks_translate}</label><br>
</div>

<b>{'preferences.account.mail.reply_button'|devblocks_translate}</b>
Expand Down