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

- fix [ 1344111 ] promote/demote swap with non-"published" assets

Browse source
This commit is contained in:
Matthew Wilson 2005-12-12 05:43:00 +00:00
parent 38f07c010b
commit 4aaf66a8a0
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,10 @@
- fix [ 1344146 ] deleting recurring events doesn't work - fix [ 1344146 ] deleting recurring events doesn't work
- fix [ 1378333 ] [WG 6.7.8] Mail Form template doesn't mark required fields - fix [ 1378333 ] [WG 6.7.8] Mail Form template doesn't mark required fields
- fix [ 1377276 ] Calendar Pop up issue - fix [ 1377276 ] Calendar Pop up issue
- fix [ 1344111 ] promote/demote swap with non-"published" assets
- removed server version tag appending. Could re-add as an setting later.
(along with the Style.pm header tag version number insertion).
- fixed poll's editForm so an option only showed up at the proper time.
- Fixed bug/rfe where it was not obvious when hovering over the rank - Fixed bug/rfe where it was not obvious when hovering over the rank
column in the Asset Manager that you can drag rows up and down. column in the Asset Manager that you can drag rows up and down.
Added cursor:move to the td's style. Added cursor:move to the td's style.

2
lib/WebGUI.pm
View file

@ -43,7 +43,7 @@ sub handler {
my $r = shift; my $r = shift;
$session{site} = shift || $r->dir_config('WebguiConfig'); $session{site} = shift || $r->dir_config('WebguiConfig');
my $s = Apache2::ServerUtil->server; my $s = Apache2::ServerUtil->server;
$s->add_version_component("WebGUI/".$WebGUI::VERSION); # $s->add_version_component("WebGUI/".$WebGUI::VERSION); # had to remove b/c it was appending on every request for that instance of httpd. :(
$session{wguri} = $r->uri; $session{wguri} = $r->uri;
$session{config} = WebGUI::Config::getConfig($s->dir_config('WebguiRoot'),$session{site}); $session{config} = WebGUI::Config::getConfig($s->dir_config('WebguiRoot'),$session{site});
### Add Apache Request stuff to global session. Yes, I know the global hash will eventually be deprecated. ### Add Apache Request stuff to global session. Yes, I know the global hash will eventually be deprecated.

2
lib/WebGUI/Asset/Wobject/Poll.pm
View file

@ -238,7 +238,7 @@ sub getEditForm {
-name=>"resetVotes", -name=>"resetVotes",
-label=>WebGUI::International::get(10,"Asset_Poll"), -label=>WebGUI::International::get(10,"Asset_Poll"),
-hoverHelp=>WebGUI::International::get('10 description',"Asset_Poll") -hoverHelp=>WebGUI::International::get('10 description',"Asset_Poll")
); ) if $session{form}{func} eq 'add';
return $tabform; return $tabform;
} }

4
lib/WebGUI/AssetLineage.pm
View file

@ -116,7 +116,7 @@ sub demote {
my $self = shift; my $self = shift;
my ($sisterLineage) = WebGUI::SQL->quickArray("select min(lineage) from asset my ($sisterLineage) = WebGUI::SQL->quickArray("select min(lineage) from asset
where parentId=".quote($self->get("parentId"))." where parentId=".quote($self->get("parentId"))."
and lineage>".quote($self->get("lineage"))); and state='published' and lineage>".quote($self->get("lineage")));
if (defined $sisterLineage) { if (defined $sisterLineage) {
$self->swapRank($sisterLineage); $self->swapRank($sisterLineage);
$self->{_properties}{lineage} = $sisterLineage; $self->{_properties}{lineage} = $sisterLineage;
@ -529,7 +529,7 @@ sub promote {
my $self = shift; my $self = shift;
my ($sisterLineage) = WebGUI::SQL->quickArray("select max(lineage) from asset my ($sisterLineage) = WebGUI::SQL->quickArray("select max(lineage) from asset
where parentId=".quote($self->get("parentId"))." where parentId=".quote($self->get("parentId"))."
and lineage<".quote($self->get("lineage"))); and state='published' and lineage<".quote($self->get("lineage")));
if (defined $sisterLineage) { if (defined $sisterLineage) {
$self->swapRank($sisterLineage); $self->swapRank($sisterLineage);
$self->{_properties}{lineage} = $sisterLineage; $self->{_properties}{lineage} = $sisterLineage;