Skip to content

Commit 43ab76b

Browse files
committed
[#103 state:committed] Fixed a bug where display preferences for the template editing screen of the system overview were not being preserved. The patch applied to Melody was also approved and incorporated into MT and will be in the next release.
1 parent 7d8309a commit 43ab76b

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

lib/MT/CMS/Template.pm

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ sub edit {
3232
my $type = $q->param('_type');
3333
my $blog = $app->blog;
3434
my $cfg = $app->config;
35-
my $perms = $app->permissions;
35+
my $perms = $app->blog ? $app->permissions : $app->user->permissions;
3636
my $can_preview = 0;
3737

3838
if ($blog) {
@@ -1298,20 +1298,20 @@ sub add_map {
12981298

12991299
sub can_view {
13001300
my ( $eh, $app, $id ) = @_;
1301-
my $perms = $app->permissions;
1301+
my $perms = $app->blog ? $app->permissions : $app->user->permissions;
13021302
return !$id || ($perms && $perms->can_edit_templates) || (!$app->blog && $app->user->can_edit_templates);
13031303
}
13041304

13051305
sub can_save {
13061306
my ( $eh, $app, $id ) = @_;
1307-
my $perms = $app->permissions;
1307+
my $perms = $app->blog ? $app->permissions : $app->user->permissions;
13081308
return ($perms && $perms->can_edit_templates) || (!$perms && $app->user->can_edit_templates);
13091309
}
13101310

13111311
sub can_delete {
13121312
my ( $eh, $app, $obj ) = @_;
13131313
return 1 if $app->user->is_superuser();
1314-
my $perms = $app->permissions;
1314+
my $perms = $app->blog ? $app->permissions : $app->user->permissions;
13151315
return ($perms && $perms->can_edit_templates) || (!$perms && $app->user->can_edit_templates);
13161316
}
13171317

@@ -1327,9 +1327,11 @@ sub pre_save {
13271327
}
13281328

13291329
$obj->text($text);
1330-
1330+
1331+
my $perms = $app->blog ? $app->permissions : $app->user->permissions;
1332+
13311333
# update text heights if necessary
1332-
if ( my $perms = $app->permissions ) {
1334+
if ( $perms ) {
13331335
my $prefs = $perms->template_prefs || '';
13341336
my $text_height = $app->param('text_height');
13351337
if ( defined $text_height ) {
@@ -1616,7 +1618,7 @@ sub dialog_publishing_profile {
16161618
$app->assert( $blog ) or return;
16171619

16181620
# permission check
1619-
my $perms = $app->permissions;
1621+
my $perms = $app->blog ? $app->permissions : $app->user->permissions;
16201622
return $app->errtrans("Permission denied.")
16211623
unless $app->user->is_superuser ||
16221624
$perms->can_administer_blog ||
@@ -1636,7 +1638,7 @@ sub dialog_refresh_templates {
16361638
$app->validate_magic or return;
16371639

16381640
# permission check
1639-
my $perms = $app->permissions;
1641+
my $perms = $app->blog ? $app->permissions : $app->user->permissions;
16401642
return $app->errtrans("Permission denied.")
16411643
unless $app->user->is_superuser()
16421644
|| $app->user->can_edit_templates()
@@ -1923,7 +1925,7 @@ sub refresh_individual_templates {
19231925
require MT::Util;
19241926

19251927
my $user = $app->user;
1926-
my $perms = $app->permissions;
1928+
my $perms = $app->blog ? $app->permissions : $app->user->permissions;
19271929
return $app->error(
19281930
$app->translate(
19291931
"Permission denied.")
@@ -2037,7 +2039,7 @@ sub clone_templates {
20372039
my ($app) = @_;
20382040

20392041
my $user = $app->user;
2040-
my $perms = $app->permissions;
2042+
my $perms = $app->blog ? $app->permissions : $app->user->permissions;
20412043
return $app->error(
20422044
$app->translate(
20432045
"Permission denied.")
@@ -2091,7 +2093,7 @@ sub publish_index_templates {
20912093
$app->validate_magic or return;
20922094

20932095
# permission check
2094-
my $perms = $app->permissions;
2096+
my $perms = $app->blog ? $app->permissions : $app->user->permissions;
20952097
return $app->errtrans("Permission denied.")
20962098
unless $app->user->is_superuser ||
20972099
$perms->can_administer_blog ||
@@ -2119,7 +2121,7 @@ sub publish_archive_templates {
21192121
$app->validate_magic or return;
21202122

21212123
# permission check
2122-
my $perms = $app->permissions;
2124+
my $perms = $app->blog ? $app->permissions : $app->user->permissions;
21232125
return $app->errtrans("Permission denied.")
21242126
unless $app->user->is_superuser
21252127
|| $perms->can_administer_blog

0 commit comments

Comments
 (0)