Commit info for scoop/lib/Scoop/Admin:
Modified Files:
Tag: CURRENT
AdminStories.pm
Log Message:
And another resync of CURRENT with the main branch. --j
Index: AdminStories.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Admin/AdminStories.pm,v
retrieving revision 1.127.2.2
retrieving revision 1.127.2.3
diff -r1.127.2.2 -r1.127.2.3
423c423
< ROWS => 'sid, uid, time, vote, section_only',
---
> COLS => 'sid, uid, time, vote, section_only',
525,531c525,534
< $params{writestatus} = -2;
< if ($params{edit_in_queue}) {
< $params{displaystatus} = -3;
< } else {
< $params{displaystatus} = -2;
< $params{timeupdate} = 'now';
< $S->move_story_to_voting($sid);
---
>
> unless ($S->have_perm('story_displaystatus_select')) {
> $params{writestatus} = -2;
> if ($params{edit_in_queue}) {
> $params{displaystatus} = -3;
> } else {
> $params{displaystatus} = -2;
> $params{timeupdate} = 'now';
> $S->move_story_to_voting($sid);
> }
537c540,543
< $params{commentstatus} = $S->{UI}->{VARS}->{default_commentstatus} || 0;
---
>
> unless ($S->have_perm('story_commentstatus_select')) {
> $params{commentstatus} = $S->{UI}->{VARS}->{default_commentstatus} || 0;
> }
562a569
>
678c685
< if $mode ne 'full';
---
> if $mode ne 'full' && (!$S->{UI}->{VARS}->{hide_story_allowed_html});
680c687
< if $mode ne 'full';
---
> if $mode ne 'full' && (!$S->{UI}->{VARS}->{hide_story_allowed_html});
720a728,733
> $displaystatus_select = $S->displaystatus_select($story_data->{displaystatus})
> if ($S->have_perm('story_displaystatus_select') or ($mode eq 'full'));
>
> $commentstatus_select = $S->commentstatus_select($story_data->{commentstatus})
> if ($S->have_perm('story_commentstatus_select') or ($mode eq 'full'));
>
726,727d738
< $displaystatus_select = $S->displaystatus_select($story_data->{displaystatus});
< $commentstatus_select = $S->commentstatus_select($story_data->{commentstatus});
1040c1051
< my $stat = shift;
---
> my $stat = shift || $S->{UI}->{VARS}->{default_displaystatus};