oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed threading

Browse source
This commit is contained in:
JT Smith 2005-10-13 22:01:58 +00:00
parent 27dd87faa0
commit 7b04c8ec78
8 changed files with 1163 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog/6.x.x.txt
View file

@ -9,6 +9,9 @@
- fix [ 1298851 ] forum subscribers still get notif. after subscr. expired
- fix [ 1305368 ] Moderation in Collaboration not working ?
- fix [ 1306912 ] CMS Matrix - Unable to approve article's
- Removed the depricated threaded view in the CS for a slight performance
gain and simplified templates.
- fix [ 1312107 ] Forum Issue in "Thread" View
6.7.6

16
docs/previousVersion.sql
View file

File diff suppressed because one or more lines are too long

1149
docs/upgrades/upgrade_6.7.6-6.7.7.pl Normal file
View file

File diff suppressed because it is too large Load diff

2
lib/WebGUI.pm
View file

@ -1,5 +1,5 @@
package WebGUI;
our $VERSION = "6.7.6";
our $VERSION = "6.7.7";
our $STATUS = "gamma";
#-------------------------------------------------------------------

6
lib/WebGUI/Asset/Post/Thread.pm
View file

@ -142,7 +142,7 @@ Formats the url to change the layout of a thread.
=head3 layout
A string indicating the type of layout to use. Can be flat, nested, or threaded.
A string indicating the type of layout to use. Can be flat or nested.
=cut
@ -631,11 +631,9 @@ sub view {
$var->{'layout.nested.url'} = $self->getLayoutUrl("nested");
$var->{'layout.flat.url'} = $self->getLayoutUrl("flat");
$var->{'layout.threaded.url'} = $self->getLayoutUrl("threaded");
my $layout = $session{scratch}{discussionLayout} || $session{user}{discussionLayout};
$var->{'layout.isFlat'} = ($layout eq "flat");
$var->{'layout.isNested'} = ($layout eq "nested");
$var->{'layout.isThreaded'} = ($layout eq "threaded" || !($var->{'layout.isNested'} || $var->{'layout.isFlat'}));
$var->{'layout.isNested'} = ($layout eq "nested" || !$var{'layout.isFlat'});
$var->{'user.isSubscribed'} = $self->isSubscribed;
$var->{'subscribe.url'} = $self->getSubscribeUrl;

1
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -174,7 +174,6 @@ sub appendTemplateLabels {
$var->{"synopsis.label"} = $i18n->get("synopsis");
$var->{"thumbnail.label"} = $i18n->get("thumbnail");
$var->{"title.label"} = $i18n->get("title");
$var->{"layout.threaded.label"} = $i18n->get("threaded");
$var->{"unlock.label"} = $i18n->get("unlock");
$var->{"unstick.label"} = $i18n->get("unstick");
$var->{"unsubscribe.label"} = $i18n->get("unsubscribe");

9
lib/WebGUI/i18n/English/Asset_Collaboration.pm
View file

@ -368,11 +368,6 @@ our $I18N = {
lastUpdated => 1109696029,
},
'threaded' => {
message => q|Threaded|,
lastUpdated => 1109696029,
},
'unlock' => {
message => q|Unlock|,
lastUpdated => 1109696029,
@ -773,10 +768,6 @@ our $I18N = {
^International("word","Asset_Collaboration"); "^International("title","Asset_Collaboration");".
<p>
<b>layout.threaded.label</b><br>
^International("word","Asset_Collaboration"); "^International("threaded","Asset_Collaboration");".
<p>
<b>unlock.label</b><br>
^International("word","Asset_Collaboration"); "^International("unlock","Asset_Collaboration");".
<p>

5
lib/WebGUI/i18n/English/WebGUI.pm
View file

@ -1673,11 +1673,6 @@ As with any delete operation, you are prompted to be sure you wish to proceed wi
lastUpdated => 1031514049
},
'511' => {
message => q|Threaded|,
lastUpdated => 1031514049
},
'665' => {
message => q|Group, Delete|,
lastUpdated => 1031514049