projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rt 4.2.13 ticket#13852
[freeside.git]
/
rt
/
share
/
html
/
Prefs
/
Other.html
diff --git
a/rt/share/html/Prefs/Other.html
b/rt/share/html/Prefs/Other.html
index
9f7e04a
..
e4d7642
100644
(file)
--- a/
rt/share/html/Prefs/Other.html
+++ b/
rt/share/html/Prefs/Other.html
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
6
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-53,6
+53,7
@@
% foreach my $section( RT->Config->Sections ) {
<&|/Widgets/TitleBox, title => loc( $section ) &>
% foreach my $option( RT->Config->Options( Section => $section ) ) {
% foreach my $section( RT->Config->Sections ) {
<&|/Widgets/TitleBox, title => loc( $section ) &>
% foreach my $option( RT->Config->Options( Section => $section ) ) {
+% next if $option eq 'EmailFrequency' && !RT->Config->Get('RecordOutgoingEmail');
% my $meta = RT->Config->Meta( $option );
<& $meta->{'Widget'},
Default => 1,
% my $meta = RT->Config->Meta( $option );
<& $meta->{'Widget'},
Default => 1,
@@
-66,9
+67,9
@@
</&>
% }
</&>
% }
-% if ( RT->Config->Get('
GnuPG
')->{'Enable'} ) {
+% if ( RT->Config->Get('
Crypt
')->{'Enable'} ) {
<&|/Widgets/TitleBox, title => loc( 'Cryptography' ) &>
<&|/Widgets/TitleBox, title => loc( 'Cryptography' ) &>
-<&|/l&>Preferred key</&>: <& /Elements/
GnuPG
/SelectKeyForEncryption, EmailAddress => $UserObj->EmailAddress, Default => $UserObj->PreferredKey &>
+<&|/l&>Preferred key</&>: <& /Elements/
Crypt
/SelectKeyForEncryption, EmailAddress => $UserObj->EmailAddress, Default => $UserObj->PreferredKey &>
</&>
% }
</&>
% }
@@
-76,7
+77,7
@@
</form>
<%INIT>
my @results;
</form>
<%INIT>
my @results;
-my $title = loc("
Setting
s");
+my $title = loc("
Preference
s");
my $UserObj = $session{'CurrentUser'}->UserObj;
my $preferences = $UserObj->Preferences( $RT::System );
my $UserObj = $session{'CurrentUser'}->UserObj;
my $preferences = $UserObj->Preferences( $RT::System );
@@
-88,6
+89,10
@@
if (defined($PreferredKey) and (not $UserObj->FirstAttribute('PreferredKey')
}
if ( $Update ) {
}
if ( $Update ) {
+ my $fsconf = eval { FS::Conf->new };
+ if ( $fsconf && $fsconf->exists('disable_acl_changes') ) {
+ push @results, loc("Preference changes disabled in public demo.");
+ } else {
$preferences ||= {};
$m->comp( '/Widgets/BulkProcess', Meta => {
map { $_ => RT->Config->Meta($_) } RT->Config->Options
$preferences ||= {};
$m->comp( '/Widgets/BulkProcess', Meta => {
map { $_ => RT->Config->Meta($_) } RT->Config->Options
@@
-100,6
+105,7
@@
if ( $Update ) {
my ($ok, $msg) = $UserObj->SetPreferences( $RT::System, $preferences );
push @results, $ok ? loc("Preferences saved.") : $msg;
my ($ok, $msg) = $UserObj->SetPreferences( $RT::System, $preferences );
push @results, $ok ? loc("Preferences saved.") : $msg;
+ }
}
</%INIT>
<%ARGS>
}
</%INIT>
<%ARGS>