a few more bug fixes
This commit is contained in:
JT Smith
parent
45eb557978
commit
c7c968eaf2
6 changed files with 60 additions and 11 deletions
|
|
@ -1,4 +1,5 @@
|
|||
6.6.2
|
||||
- Changed the back to site link in the admin console to act intuitively rather than logically.
|
||||
- fix [ 1220552 ] moderation of postings/threads
|
||||
- fix [ 1218870 ] !! Bugs in Article.pm (old 'Discussion allowed' feature)
|
||||
- Fixed help for LDAP connections.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
insert into webguiVersion values ('6.6.2','upgrade',unix_timestamp());
|
||||
alter table Shortcut add disableContentLock int(11) NOT NULL default '0';
|
||||
update template set template='<a name="<tmpl_var assetId>"></a><tmpl_if session.var.adminOn><p><tmpl_var controls></p></tmpl_if><style>.productFeatureHeader,.productSpecificationHeader,.productRelatedHeader,.productAccessoryHeader, .productBenefitHeader { font-weight: bold; font-size: 15px;}.productFeature,.productSpecification,.productRelated,.productAccessory, .productBenefit { font-size: 12px;}.productAttributeSeperator { background-color: black;}</style><tmpl_if displayTitle> <h1><tmpl_var title></h1></tmpl_if><table width="100%" cellpadding="3" cellspacing="0" border="0"><tr> <td class="content" valign="top"><tmpl_if description> <tmpl_var description><p /></tmpl_if><tmpl_if price> <b>Price:</b> <tmpl_var price><br /></tmpl_if><tmpl_if productnumber> <b>Product Number:</b> <tmpl_var productNumber><br /></tmpl_if><br><tmpl_if brochure.url> <a href="<tmpl_var brochure.url>"><img src="<tmpl_var brochure.icon>" border=0 align="absmiddle"><tmpl_var brochure.label></a><br /></tmpl_if><tmpl_if manual.url> <a href="<tmpl_var manual.url>"><img src="<tmpl_var manual.icon>" border=0 align="absmiddle"><tmpl_var manual.label></a><br /></tmpl_if><tmpl_if warranty.url> <a href="<tmpl_var warranty.url>"><img src="<tmpl_var warranty.icon>" border=0 align="absmiddle"><tmpl_var warranty.label></a><br /></tmpl_if> </td><td valign="top"><tmpl_if thumbnail1> <a href="<tmpl_var image1>"><img src="<tmpl_var thumbnail1>" border="0" /></a><p /></tmpl_if><tmpl_if thumbnail2> <a href="<tmpl_var image2>"><img src="<tmpl_var thumbnail2>" border="0" /></a><p /></tmpl_if><tmpl_if thumbnail3> <a href="<tmpl_var image3>"><img src="<tmpl_var thumbnail3>" border="0" /></a><p /></tmpl_if> </td></tr></table><table border="0" cellpadding="0" cellspacing="5"><tr><td valign="top" class="productFeature"><div class="productFeatureHeader">Features</div><tmpl_if session.var.adminOn> <a href="<tmpl_var addfeature.url>"><tmpl_var addfeature.label></a><p /></tmpl_if><tmpl_loop feature_loop> <tmpl_if session.var.adminOn><tmpl_var feature.controls></tmpl_if><tmpl_var feature.feature><br /></tmpl_loop><p/></td> <td class="productAttributeSeperator"><img src="^Extras;spacer.gif" width="1" height="1"></td> <td valign="top" class="productBenefit"><div class="productBenefitHeader">Benefits</div><tmpl_if session.var.adminOn> <a href="<tmpl_var addBenefit.url>"><tmpl_var addBenefit.label></a><p /></tmpl_if><tmpl_loop benefit_loop> <tmpl_if session.var.adminOn><tmpl_var benefit.controls></tmpl_if><tmpl_var benefit.benefit><br /></tmpl_loop><p/></td> <td class="productAttributeSeperator"><img src="^Extras;spacer.gif" width="1" height="1"></td> <td valign="top" class="productSpecification"><div class="productSpecificationHeader">Specifications</div><tmpl_if session.var.adminOn> <a href="<tmpl_var addSpecification.url>"><tmpl_var addSpecification.label></a><p /></tmpl_if><tmpl_loop specification_loop> <tmpl_if session.var.adminOn><tmpl_var specification.controls></tmpl_if><b><tmpl_var specification.label>:</b> <tmpl_var specification.specification> <tmpl_var specification.units><br /></tmpl_loop><p/></td> <td class="productAttributeSeperator"><img src="^Extras;spacer.gif" width="1" height="1"></td> <td valign="top" class="productAccessory"><div class="productAccessoryHeader">Accessories</div><tmpl_if session.var.adminOn> <a href="<tmpl_var addaccessory.url>"><tmpl_var addaccessory.label></a><p /></tmpl_if><tmpl_loop accessory_loop> <tmpl_if session.var.adminOn><tmpl_var accessory.controls></tmpl_if><a href="<tmpl_var accessory.url>"><tmpl_var accessory.title></a><br /></tmpl_loop><p/></td> <td class="productAttributeSeperator"><img src="^Extras;spacer.gif" width="1" height="1"></td> <td valign="top" class="productRelated"><div class="productRelatedHeader">Related Products</div><tmpl_if session.var.adminOn> <a href="<tmpl_var addRelatedProduct.url>"><tmpl_var addRelatedProduct.label></a><p /></tmpl_if><tmpl_loop relatedproduct_loop> <tmpl_if session.var.adminOn><tmpl_var RelatedProduct.controls></tmpl_if><a href="<tmpl_var relatedproduct.url>"><tmpl_var relatedproduct.title></a><br /></tmpl_loop></td></tr></table>' where assetId='PBtmpl0000000000000056';
|
||||
update template set template='^StyleSheet(^Extras;/adminConsole/adminConsole.css);\r\n^JavaScript(^Extras;/adminConsole/adminConsole.js);\r\n\r\n<div id=\"application_help\">\r\n <tmpl_if help.url>\r\n <a href=\"<tmpl_var help.url>\" target=\"_blank\"><img src=\"^Extras;/adminConsole/small/help.gif\" alt=\"?\" border=\"0\" /></a>\r\n </tmpl_if>\r\n</div>\r\n<div id=\"application_icon\">\r\n <img src=\"<tmpl_var application.icon>\" border=\"0\" title=\"<tmpl_var application.title>\" alt=\"<tmpl_var application.title>\" />\r\n</div>\r\n<div class=\"adminConsoleTitleIconMedalian\">\r\n<img src=\"^Extras;/adminConsole/medalian.gif\" border=\"0\" alt=\"*\" />\r\n</div>\r\n<div id=\"console_icon\">\r\n <img src=\"<tmpl_var console.icon>\" border=\"0\" title=\"<tmpl_var console.title>\" alt=\"<tmpl_var console.title>\" />\r\n</div>\r\n<div id=\"application_title\">\r\n <tmpl_var application.title>\r\n</div>\r\n<div id=\"console_title\">\r\n <tmpl_var console.title>\r\n</div>\r\n<div id=\"application_workarea\">\r\n <tmpl_var application.workArea>\r\n</div>\r\n<div id=\"console_workarea\">\r\n <div class=\"adminConsoleSpacer\">\r\n \r\n </div>\r\n <tmpl_loop application_loop>\r\n <tmpl_if canUse>\r\n <div class=\"adminConsoleApplication\">\r\n <a href=\"<tmpl_var url>\"><img src=\"<tmpl_var icon>\" border=\"0\" title=\"<tmpl_var title>\" alt=\"<tmpl_var title>\" /></a><br />\r\n <a href=\"<tmpl_var url>\"><tmpl_var title></a>\r\n </div>\r\n </tmpl_if>\r\n </tmpl_loop>\r\n <div class=\"adminConsoleSpacer\">\r\n \r\n </div>\r\n</div>\r\n<div class=\"adminConsoleMenu\">\r\n <div id=\"adminConsoleMainMenu\" class=\"adminConsoleMainMenu\">\r\n <div id=\"console_toggle_on\">\r\n <a href=\"#\" onClick=\"toggleAdminConsole()\"><tmpl_var toggle.on.label></a><br />\r\n </div>\r\n <div id=\"console_toggle_off\">\r\n <a href=\"#\" onClick=\"toggleAdminConsole()\"><tmpl_var toggle.off.label></a><br />\r\n </div>\r\n </div>\r\n <div id=\"adminConsoleApplicationSubmenu\" class=\"adminConsoleApplicationSubmenu\">\r\n <tmpl_loop submenu_loop>\r\n <a href=\"<tmpl_var url>\" <tmpl_var extras>><tmpl_var label></a><br />\r\n </tmpl_loop>\r\n </div>\r\n <div id=\"adminConsoleUtilityMenu\" class=\"adminConsoleUtilityMenu\">\r\n <a href=\"<tmpl_var backtosite.url>\"><tmpl_var backtosite.label></a><br />\r\n ^AdminToggle;<br />\r\n ^LoginToggle;<br />\r\n </div>\r\n</div>\r\n<script lang=\"JavaScript\">\r\n initAdminConsole(<tmpl_if application.title>true<tmpl_else>false</tmpl_if>,<tmpl_if submenu_loop>true<tmpl_else>false</tmpl_if>);\r\n</script>\r\n' where assetId='PBtmpl0000000000000001';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package WebGUI;
|
||||
our $VERSION = "6.6.2";
|
||||
our $STATUS = "beta";
|
||||
our $STATUS = "gamma";
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
# WebGUI is Copyright 2001-2005 Plain Black Corporation.
|
||||
|
|
|
|||
|
|
@ -399,6 +399,18 @@ sub render {
|
|||
$var{"console.canUse"} = $acParams->{canUse};
|
||||
$var{"console.icon"} = $acParams->{icon};
|
||||
$var{"help.url"} = $self->{_helpUrl};
|
||||
if (exists $session{asset}) {
|
||||
my $importNode = $session{asset}->getImportNode;
|
||||
my $importNodeLineage = $importNode->get("lineage");
|
||||
my $assetLineage = $session{asset}->get("lineage");
|
||||
if ($assetLineage =~ /^$importNodeLineage/) {
|
||||
$var{"backtosite.url"} = $session{asset}->getDefault->getUrl;
|
||||
} else {
|
||||
$var{"backtosite.url"} = $session{asset}->getContainer->getUrl;
|
||||
}
|
||||
} else {
|
||||
$var{"backtosite.url"} = WebGUI::URL::page();
|
||||
}
|
||||
$var{"application_loop"} = $self->getAdminFunction;
|
||||
return WebGUI::Style::process(WebGUI::Asset::Template->new($session{setting}{AdminConsoleTemplate})->process(\%var),"PBtmpl0000000000000137");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,10 +51,10 @@ A lineage is a concatenated series of sequence numbers, each six digits long, th
|
|||
|
||||
use WebGUI::Asset;
|
||||
|
||||
$AssetObject= WebGUI::Asset->addChild(\%properties);
|
||||
$integer= WebGUI::Asset->canEdit("An_Id_AbCdeFGHiJkLMNOP");
|
||||
$integer= WebGUI::Asset->canView("An_Id_AbCdeFGHiJkLMNOP");
|
||||
WebGUI::Asset->cascadeLineage(100001,100101110111);
|
||||
$newAsset = $asset->addChild(\%properties);
|
||||
$boolean = $asset->canEdit("An_Id_AbCdeFGHiJkLMNOP");
|
||||
$boolean = $asset->canView("An_Id_AbCdeFGHiJkLMNOP");
|
||||
$asset->cascadeLineage(100001,100101110111);
|
||||
$html= WebGUI::Asset->checkExportPath();
|
||||
WebGUI::Asset->cut();
|
||||
$arrayRef= WebGUI::Asset->definition(\@arr);
|
||||
|
|
@ -71,7 +71,8 @@ A lineage is a concatenated series of sequence numbers, each six digits long, th
|
|||
$JavaScript= WebGUI::Asset->getAssetManagerControl(\%hashref, $string, $bool);
|
||||
$arrayRef= WebGUI::Asset->getAssetsInClipboard($boolean, $string);
|
||||
$arrayRef= WebGUI::Asset->getAssetsInTrash($boolean, $string);
|
||||
$containerRef= WebGUI::Asset->getContainer();
|
||||
$containerRef= $asset->getContainer();
|
||||
$asset = WebGUI::Asset->getDefault();
|
||||
$tabform= WebGUI::Asset->getEditForm();
|
||||
getFirstChild
|
||||
getIcon
|
||||
|
|
@ -83,6 +84,7 @@ A lineage is a concatenated series of sequence numbers, each six digits long, th
|
|||
getMetaDataFields
|
||||
getName
|
||||
getNextChildRank
|
||||
getNotFound
|
||||
getParent
|
||||
getParentLineage
|
||||
getRank
|
||||
|
|
@ -966,6 +968,20 @@ sub getContainer {
|
|||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 getDefault ( )
|
||||
|
||||
Returns the default object, which is also known by some as the "Home Page". The default object is set in the settings.
|
||||
|
||||
=cut
|
||||
|
||||
sub getDefault {
|
||||
my $class = shift;
|
||||
return $class->newByDynamicClass($session{setting}{defaultPage});
|
||||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 getEditForm ( )
|
||||
|
|
@ -976,7 +992,7 @@ Creates and returns a tabform to edit parameters of an Asset.
|
|||
|
||||
sub getEditForm {
|
||||
my $self = shift;
|
||||
my $tabform = WebGUI::TabForm->new();
|
||||
my $tabform = WebGUI::TabForm->new(undef,undef,$self->getContainer->getUrl());
|
||||
$tabform->hidden({
|
||||
name=>"func",
|
||||
value=>"editSave"
|
||||
|
|
@ -1539,6 +1555,20 @@ sub getNextChildRank {
|
|||
return $self->formatRank($rank);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 getNotFound ( )
|
||||
|
||||
Returns the not found object. The not found object is set in the settings.
|
||||
|
||||
=cut
|
||||
|
||||
sub getNotFound {
|
||||
my $class = shift;
|
||||
return $class->newByDynamicClass($session{setting}{notFoundPage});
|
||||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 getPackageList ( )
|
||||
|
|
@ -1884,7 +1914,7 @@ sub newByDynamicClass {
|
|||
if ($className eq "") {
|
||||
WebGUI::HTTP::setStatus('404',"Page Not Found");
|
||||
WebGUI::ErrorHandler::fatal("The page not found page doesn't exist.") if ($assetId eq $session{setting}{notFoundPage});
|
||||
return WebGUI::Asset->newByDynamicClass($session{setting}{notFoundPage});
|
||||
return $class->getNotFound;
|
||||
}
|
||||
my $cmd = "use ".$className;
|
||||
eval ($cmd);
|
||||
|
|
@ -1972,10 +2002,10 @@ sub newByUrl {
|
|||
if ($asset->{assetId} ne "" || $asset->{className} ne "") {
|
||||
return WebGUI::Asset->newByDynamicClass($asset->{assetId}, $asset->{className});
|
||||
} else {
|
||||
return $class->newByDynamicClass($session{setting}{notFoundPage});
|
||||
return $class->getNotFound;
|
||||
}
|
||||
}
|
||||
return $class->newByDynamicClass($session{setting}{defaultPage});
|
||||
return $class->getDefault;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -185,6 +185,10 @@ A hash reference containing the definition of the tabs. It should be constructed
|
|||
A string containing the link to the tab-CascadingStyleSheet
|
||||
|
||||
default = extrasPath.'/tabs/tabs.css'
|
||||
|
||||
=head3 cancelUrl
|
||||
|
||||
A URL to go to when the cancel button is pressed.
|
||||
|
||||
=cut
|
||||
|
||||
|
|
@ -192,6 +196,7 @@ sub new {
|
|||
my $class = shift;
|
||||
my $startingTabs = shift;
|
||||
my $css = shift || $session{config}{extrasURL}.'/tabs/tabs.css';
|
||||
my $cancelUrl = shift || WebGUI::URL::page();
|
||||
my %tabs;
|
||||
tie %tabs, 'Tie::IxHash';
|
||||
foreach my $key (keys %{$startingTabs}) {
|
||||
|
|
@ -201,7 +206,7 @@ sub new {
|
|||
}
|
||||
my $cancel = WebGUI::Form::button({
|
||||
value=>WebGUI::International::get('cancel'),
|
||||
extras=>q|onClick="location.href='|.WebGUI::URL::page().q|'"|
|
||||
extras=>q|onClick="location.href='|.$cancelUrl.q|'"|
|
||||
});
|
||||
bless { _cancel=>$cancel, _submit=>WebGUI::Form::submit(), _form=>WebGUI::Form::formHeader(), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue