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

more bug fixes

Browse source
This commit is contained in:
JT Smith 2005-03-19 20:57:08 +00:00
parent 6866f7dd2d
commit acf5457f6a
12 changed files with 142 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,14 @@
- fix [ 1166071 ] Create New User allows blank username [mwilson]
- fix [ 1166133 ] DataForm www_edit and www_editField's "proceed" [mwilson]
- fix [ 1164211 ] DataForm export tab deliniated always contains.. [mwilson]
- fix [ 1165616 ] calling a non-existent func= on a good url crashes Apache
- fix [ 1154384 ] 6.2.11 Admins with default UI level
- fix [ 1151879 ] Search button changes to "Please wait"
- fix [ 1165645 ] Search not working
- fix [ 1157233 ] search crashes
- fix [ 1146359 ] certain templates still hardcoded
- fix [ 1056470 ] Improper macro hangs calendar
- fix [ 1120959 ] 5.5.x forms - export tab delimited
6.5.2

16
docs/upgrades/upgrade_6.5.2-6.5.3.pl
View file

@ -66,6 +66,8 @@ WebGUI::SQL->write("update asset set groupIdView='4' where className='WebGUI::As
WebGUI::SQL->write("update wobject set styleTemplateId='PBtmpl0000000000000060' where assetId='$templateFolder'");
#--------------------------------------------
print "\tSetting up a new failsafe style\n" unless ($quiet);
my $newFailSafe = '
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@ -132,6 +134,20 @@ my $newFailSafe = '
WebGUI::SQL->write("update template set template=".quote($newFailSafe)." where assetId='PBtmpl0000000000000060'");
#--------------------------------------------
print "\tMaking templates editable for files and images.\n" unless ($quiet);
my $sth = WebGUI::SQL->read("select assetId,className from asset where className like 'WebGUI::Asset::File%'");
while (my ($id, $class) = $sth->array) {
my $template;
if ($class =~ /Image/) {
$template = 'PBtmpl0000000000000088';
} else {
$template = 'PBtmpl0000000000000024';
}
WebGUI::SQL->write("update FileAsset set templateId=".quote($template)." where assetId=".quote($id));
}
$sth->finish;
WebGUI::Session::close();

2
docs/upgrades/upgrade_6.5.2-6.5.3.sql
View file

@ -28,4 +28,6 @@ update template set template='<a name=\"<tmpl_var assetId>\"></a> \r\n<tmpl_if s
update template set template='<a name=\"<tmpl_var assetId>\"></a> \r\n<tmpl_if session.var.adminOn> \r\n <tmpl_var controls> \r\n</tmpl_if>\r\n\r\n<style type=\"text/css\">\r\n.forumHead {\r\n background-color: #eeeeee;\r\n border-bottom: 1px solid #cccccc;\r\n padding: 2px;\r\n padding-bottom: 4px;\r\n font-size: 13px;\r\n font-weight: bold;\r\n}\r\n.oddThread {\r\n font-size: 13px;\r\n border-bottom: 1px dashed #83cc83;\r\n padding-bottom: 4px;\r\n}\r\n.evenThread {\r\n font-size: 13px;\r\n border-bottom: 1px dashed #aaaaff;\r\n padding-bottom: 4px;\r\n}\r\n</style>\r\n\r\n\r\n<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description>\r\n</tmpl_if>\r\n\r\n<p>\r\n <tmpl_if user.canPost>\r\n <a href=\"<tmpl_var add.url>\"><tmpl_var add.label></a>\r\n &bull;\r\n </tmpl_if>\r\n <tmpl_unless user.isVisitor>\r\n <tmpl_if user.isSubscribed>\r\n <a href=\"<tmpl_var unsubscribe.url>\"><tmpl_var unsubscribe.label></a>\r\n <tmpl_else>\r\n <a href=\"<tmpl_var subscribe.url>\"><tmpl_var subscribe.label></a>\r\n </tmpl_if>\r\n &bull;\r\n </tmpl_unless>\r\n <a href=\"<tmpl_var search.url>\"><tmpl_var search.label></a>\r\n</p>\r\n\r\n\r\n<table width=\"100%\">\r\n<tr>\r\n <tmpl_if user.isModerator>\r\n <td class=\"forumHead\"><tmpl_var status.label></td>\r\n </tmpl_if>\r\n <td class=\"forumHead\"><a href=\"<tmpl_var sortby.title.url>\"><tmpl_var title.label></a></td>\r\n <td class=\"forumHead\"><tmpl_var thumbnail.label></td>\r\n <td class=\"forumHead\"><a href=\"<tmpl_var sortby.date.url>\"><tmpl_var date.label></a></td>\r\n <td class=\"forumHead\"><a href=\"<tmpl_var sortby.username.url>\"><tmpl_var by.label></a></td>\r\n</tr>\r\n<tmpl_loop post_loop>\r\n <tr>\r\n <tmpl_if user.isModerator>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\"><tmpl_var status></td>\r\n </tmpl_if>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\"><a href=\"<tmpl_var url>\"><tmpl_var title></a><tmpl_if user.isPoster> (<tmpl_var status>)</tmpl_if></td>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\" style=\"text-align: center;\">\r\n <tmpl_if thumbnail>\r\n <a href=\"<tmpl_var url>\"><img src=\"<tmpl_var thumbnail>\" border=\"0\" alt=\"<tmpl_var title>\" /></a>\r\n <tmpl_else>\r\n &nbsp;\r\n </tmpl_if>\r\n </td>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\"><tmpl_var dateUpdated.human></td>\r\n <tmpl_if user.isVisitor>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\"><tmpl_var username></td>\r\n <tmpl_else>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\"><a href=\"<tmpl_var userProfile.url>\"><tmpl_var username></a></td>\r\n </tmpl_if>\r\n </tr>\r\n</tmpl_loop>\r\n</table>\r\n\r\n\r\n<tmpl_if pagination.pageCount.isMultiple>\r\n <div class=\"pagination\">\r\n <tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>\r\n </div>\r\n</tmpl_if>\r\n' where assetId='PBtmpl0000000000000097';
update template set template='<a name=\"<tmpl_var assetId>\"></a> \r\n<tmpl_if session.var.adminOn> \r\n <tmpl_var controls> \r\n</tmpl_if>\r\n\r\n\r\n<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description>\r\n</tmpl_if>\r\n\r\n<p>\r\n <tmpl_if user.canPost>\r\n <a href=\"<tmpl_var add.url>\">[<tmpl_var add.label>]</a>\r\n </tmpl_if>\r\n <tmpl_unless user.isVisitor>\r\n <tmpl_if user.isSubscribed>\r\n <a href=\"<tmpl_var unsubscribe.url>\">[<tmpl_var unsubscribe.label>]</a>\r\n <tmpl_else>\r\n <a href=\"<tmpl_var subscribe.url>\">[<tmpl_var subscribe.label>]</a>\r\n </tmpl_if>\r\n </tmpl_unless>\r\n <tmpl_if pagination.pageCount.isMultiple> \r\n <a href=\"<tmpl_var search.url>\">[<tmpl_var search.label>]</a>\r\n </tmpl_if>\r\n</p>\r\n\r\n<ul>\r\n <tmpl_loop post_loop>\r\n <li>\r\n <tmpl_if user.isPoster>\r\n <tmpl_unless session.var.adminOn>\r\n [<a href=\"<tmpl_var edit.url>\"><tmpl_var edit.label></a>]\r\n </tmpl_unless>\r\n </tmpl_if>\r\n <tmpl_if user.isModerator>\r\n <tmpl_if session.var.adminOn>\r\n <tmpl_var controls>\r\n <tmpl_else>\r\n <tmpl_unless user.isPoster>\r\n <tmpl_unless session.var.adminOn>\r\n [<a href=\"<tmpl_var edit.url>\"><tmpl_var edit.label></a>]\r\n </tmpl_unless>\r\n </tmpl_unless>\r\n </tmpl_if>\r\n (<a href=\"<tmpl_var url>\"><tmpl_var status></a>)\r\n </tmpl_if>\r\n <tmpl_if userDefined1><a href=\"<tmpl_var userDefined1>\" <tmpl_if userDefined2>target=\"_blank\"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>\r\n <tmpl_if content>\r\n - <tmpl_var content>\r\n </tmpl_if>\r\n </li>\r\n </tmpl_loop>\r\n</ul>\r\n\r\n\r\n\r\n<tmpl_if pagination.pageCount.isMultiple>\r\n <div class=\"pagination\">\r\n <tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>\r\n </div>\r\n</tmpl_if>\r\n\r\n\r\n' where assetId='PBtmpl0000000000000082';
update template set template='<a name=\"<tmpl_var assetId>\"></a> \r\n<tmpl_if session.var.adminOn> \r\n <p><tmpl_var controls></p> \r\n</tmpl_if>\r\n\r\n<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description>\r\n</tmpl_if>\r\n\r\n\r\n<p>\r\n <tmpl_if user.canPost>\r\n <a href=\"<tmpl_var add.url>\"><tmpl_var add.label></a>\r\n &bull;\r\n </tmpl_if>\r\n <tmpl_unless user.isVisitor>\r\n <tmpl_if user.isSubscribed>\r\n <a href=\"<tmpl_var unsubscribe.url>\"><tmpl_var unsubscribe.label></a>\r\n <tmpl_else>\r\n <a href=\"<tmpl_var subscribe.url>\"><tmpl_var subscribe.label></a>\r\n </tmpl_if>\r\n &bull;\r\n </tmpl_unless>\r\n <a href=\"<tmpl_var search.url>\"><tmpl_var search.label></a>\r\n</p>\r\n\r\n<style type=\"text/css\">\r\n.weblogTitleBar {\r\n font-weight: bold;\r\n font-size: 14px;\r\n}\r\n.weblogLegend {\r\n font-size: 9px;\r\n color: #999999;\r\n}\r\n.weblogReadMore {\r\n text-align: right;\r\n font-size: 9px;\r\n width: 100%;\r\n}\r\n.weblogSynopsis {\r\n border: 1px solid #bbbbbb;\r\n font-size: 13px;\r\n padding: 5px;\r\n -moz-border-radius: 6px;\r\n}\r\n</style>\r\n\r\n<p />\r\n\r\n<tmpl_loop post_loop>\r\n <div class=\"weblogTitleBar\">\r\n <tmpl_var title> \r\n </div>\r\n <fieldset class=\"weblogSynopsis\">\r\n <legend class=\"weblogLegend\" align=\"left\">\r\n <tmpl_var by.label> <a href=\"<tmpl_var userProfile.url>\"><tmpl_var username></a> \r\n - \r\n <tmpl_var dateSubmitted.human>\r\n <tmpl_if replies>\r\n - <tmpl_var replies> <tmpl_var replies.label>\r\n </tmpl_if>\r\n <tmpl_if user.isPoster>\r\n - <tmpl_var status>\r\n <tmpl_else>\r\n <tmpl_if user.isModerator>\r\n - <tmpl_var status>\r\n </tmpl_if>\r\n </tmpl_if>\r\n </legend>\r\n <tmpl_if thumbnail>\r\n <a href=\"<tmpl_var url>\"><img src=\"<tmpl_var thumbnail>\" border=\"0\" alt=\"<tmpl_var title>\" align=\"right\" /></a>\r\n </tmpl_if>\r\n <tmpl_var synopsis>\r\n <div class=\"weblogReadMore\">\r\n <a href=\"<tmpl_var url>\"><tmpl_var readmore.label></a>\r\n </div>\r\n </fieldset>\r\n <p />\r\n</tmpl_loop> \r\n\r\n \r\n\r\n<tmpl_if pagination.pageCount.isMultiple>\r\n <div class=\"pagination\">\r\n <tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>\r\n </div>\r\n</tmpl_if>\r\n\r\n ' where assetId='PBtmpl0000000000000112';
alter table FileAsset add column templateId varchar(22) not null;
alter table snippet add column processAsTemplate int not null default 0;

2
etc/WebGUI.conf.original
View file

@ -72,7 +72,6 @@ macros=# => Hash_userId, \
GroupDelete => GroupDelete, \
GroupText => GroupText, \
H => H_homeLink, \
I => I_imageWithTags, \
International => International, \
JavaScript => JavaScript, \
L => L_loginBox, \
@ -94,7 +93,6 @@ macros=# => Hash_userId, \
a => a_account, \
c => c_companyName, \
e => e_companyEmail, \
i => i_imageNoTags, \
r => r_printable, \
u => u_companyUrl

3
lib/WebGUI.pm
View file

@ -97,7 +97,8 @@ sub page {
$method = "www_".$method;
$output = eval{$asset->$method()};
if ($@) {
WebGUI::ErrorHandler::fatalError("Couldn't call method ".$method." on asset for ".$session{env}{PATH_INFO}." Root cause: ".$@);
WebGUI::ErrorHandler::warn("Couldn't call method ".$method." on asset for ".$session{env}{PATH_INFO}." Root cause: ".$@);
$output = $asset->www_view;
} else {
if ($output eq "" && $method ne "view") {
$output = $asset->www_view;

15
lib/WebGUI/Asset/File.pm
View file

@ -77,6 +77,10 @@ sub definition {
noFormPost=>1,
fieldType=>'hidden',
defaultValue=>undef
},
templateId=>{
fieldType=>'template',
defaultValue=>'PBtmpl0000000000000024'
}
}
});
@ -242,7 +246,7 @@ sub view {
$var{controls} = $self->getToolbar;
$var{fileUrl} = $self->getFileUrl;
$var{fileIcon} = $self->getFileIconUrl;
return $self->processTemplate(\%var,"PBtmpl0000000000000024");
return $self->processTemplate(\%var,$self->getValue("templateId"));
}
@ -250,7 +254,12 @@ sub view {
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->getAdminConsole->render($self->getEditForm->print,"Edit File");
my $tabform = $self->getEditForm;
$tabform->getTab("display")->template(
-value=>$self->getValue("templateId"),
-namespace=>"FileAsset"
);
return $self->getAdminConsole->render($tabform->print,"Edit File");
}
@ -258,7 +267,7 @@ sub www_view {
my $self = shift;
return WebGUI::Privilege::noAccess() unless $self->canView;
if ($session{var}{adminOn}) {
return $self->www_edit;
return $self->getContainer->www_view;
}
WebGUI::HTTP::setRedirect($self->getFileUrl);
return "";

10
lib/WebGUI/Asset/File/Image.pm
View file

@ -215,7 +215,7 @@ sub view {
$var{fileUrl} = $self->getFileUrl;
$var{fileIcon} = $self->getFileIconUrl;
$var{thumbnail} = $self->getThumbnailUrl;
return $self->processTemplate(\%var,"PBtmpl0000000000000088");
return $self->processTemplate(\%var,$self->get("templateId"));
}
@ -225,7 +225,13 @@ sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=resize'),WebGUI::International::get("resize image","Image")) if ($self->get("filename"));
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("edit image","Image"));
my $tabform = $self->getEditForm;
$tabform->getTab("display")->template(
-value=>$self->get("templateId"),
-namespace=>"ImageAsset",
-defaultValue=>"PBtmpl0000000000000088"
);
return $self->getAdminConsole->render($tabform->print,WebGUI::International::get("edit image","Image"));
}
#-------------------------------------------------------------------

25
lib/WebGUI/Asset/Snippet.pm
View file

@ -63,10 +63,14 @@ sub definition {
tableName=>'snippet',
className=>'WebGUI::Asset::Snippet',
properties=>{
snippet=>{
fieldType=>'codearea',
defaultValue=>undef
}
snippet=>{
fieldType=>'codearea',
defaultValue=>undef
},
processAsTemplate=>{
fieldType=>'yesNo',
defaultValue=>0
}
}
});
return $class->SUPER::definition($definition);
@ -88,9 +92,13 @@ sub getEditForm {
$tabform->getTab("properties")->codearea(
-name=>"snippet",
-label=>WebGUI::International::get('snippet', 'Snippet'),
-label=>"Snippet",
-value=>$self->getValue("snippet")
);
$tabform->getTab("properties")->yesNo(
-name=>"processAsTemplate",
-label=>WebGUI::International::get('process as template', 'Snippet'),
-value=>$self->getValue("processAsTemplate")
);
return $tabform;
}
@ -147,9 +155,10 @@ sub getName {
#-------------------------------------------------------------------
sub view {
my $self = shift;
my $calledAsWebMethod = shift;
my $output = WebGUI::Macro::process($self->get("snippet"));
# if it's a javascript file this would break it
# $output = '<p>'.$self->getToolbar.'</p>'.$output if ($session{var}{adminOn});
$output = '<p>'.$self->getToolbar.'</p>'.$output if ($session{var}{adminOn} && !$calledAsWebMethod);
return $output unless ($self->getValue("processAsTemplate"));
return WebGUI::Asset::Template->processRaw($output);
}
@ -170,7 +179,7 @@ A web accessible version of the view method.
sub www_view {
my $self = shift;
return $self->view;
return $self->view(1);
}

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

@ -62,18 +62,20 @@ sub appendPostListTemplateVars {
for (my $i=0;$i<=$post->get("rating");$i++) {
push(@rating_loop,{'rating_loop.count'=>$i});
}
my $lastPost = $post->getLastPost();
my %lastReply;
if ($self->get("displayLastReply")) {
%lastReply = (
"lastReply.url"=>$lastPost->getUrl(),
"lastReply.title"=>$lastPost->get("title"),
"lastReply.user.isVisitor"=>$lastPost->get("ownerUserId") eq "1",
"lastReply.username"=>$lastPost->get("username"),
"lastReply.userProfile.url"=>$lastPost->WebGUI::Asset::Post::getPosterProfileUrl(),
"lastReply.dateSubmitted.human"=>epochToHuman($lastPost->get("dateSubmitted"),"%z"),
"lastReply.timeSubmitted.human"=>epochToHuman($lastPost->get("dateSubmitted"),"%Z")
);
if ($post->get("className") =~ /Thread/) {
my $lastPost = $post->getLastPost();
if ($self->get("displayLastReply")) {
%lastReply = (
"lastReply.url"=>$lastPost->getUrl(),
"lastReply.title"=>$lastPost->get("title"),
"lastReply.user.isVisitor"=>$lastPost->get("ownerUserId") eq "1",
"lastReply.username"=>$lastPost->get("username"),
"lastReply.userProfile.url"=>$lastPost->WebGUI::Asset::Post::getPosterProfileUrl(),
"lastReply.dateSubmitted.human"=>epochToHuman($lastPost->get("dateSubmitted"),"%z"),
"lastReply.timeSubmitted.human"=>epochToHuman($lastPost->get("dateSubmitted"),"%Z")
);
}
}
push(@{$var->{post_loop}}, {
%{$post->get},

67
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -883,27 +883,52 @@ sub www_editTabSave {
#-------------------------------------------------------------------
sub www_exportTab {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
WebGUI::HTTP::setFilename($self->get("url").".tab","text/plain");
my %fields = WebGUI::SQL->buildHash("select DataForm_fieldId,name from DataForm_field where assetId=".quote($self->getId)." order by sequenceNumber");
my $select = "select a.DataForm_entryId as entryId, a.ipAddress, a.username, a.userId, a.submissionDate";
my $from = " from DataForm_entry a";
my $join;
my $where = " where a.assetId=".quote($self->getId);
my $orderBy = " order by a.DataForm_entryId";
my $columnCounter = "b";
my $mailData = ($self->get("mailData") == 0);
foreach my $fieldId (keys %fields) {
next if (isIn($fields{$fieldId}, qw(to from cc bcc subject)) && $mailData);
my $extension = "";
$extension = "mail_" if (isIn($fields{$fieldId}, qw(to from cc bcc subject)));
$select .= ", ".$columnCounter.".value as ".$extension.$fields{$fieldId};
$join .= " left join DataForm_entryData ".$columnCounter." on a.DataForm_entryId=".$columnCounter.".DataForm_entryId and "
.$columnCounter.".DataForm_fieldId=".quote($fieldId);
$columnCounter++;
}
return WebGUI::SQL->quickTab($select.$from.$join.$where.$orderBy);
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
WebGUI::HTTP::setFilename($self->get("url").".tab","text/plain");
my %fields = WebGUI::SQL->buildHash("select DataForm_fieldId,name from DataForm_field where
assetId=".quote($self->getId)." order by sequenceNumber");
my @data;
my $entries = WebGUI::SQL->read("select * from DataForm_entry where assetId=".quote($self->getId));
my $i;
my $noMailData = ($self->get("mailData") == 0);
while (my $entryData = $entries->hashRef) {
$data[$i] = {
entryId => $entryData->{DataForm_entryId},
ipAddress => $entryData->{ipAddress},
username => $entryData->{username},
userId => $entryData->{userId},
submissionDate => WebGUI::DateTime::epochToHuman($entryData->{submissionDate}),
};
my $values = WebGUI::SQL->read("select value,DataForm_fieldId from DataForm_entryData where
DataForm_entryId=".quote($entryData->{DataForm_entryId}));
while (my ($value, $fieldId) = $values->array) {
next if (isIn($fields{$fieldId}, qw(to from cc bcc subject)) && $noMailData);
$data[$i]{$fields{$fieldId}} = $value;
}
$values->finish;
$i++;
}
$entries->finish;
my @row;
foreach my $fieldId (keys %fields) {
next if (isIn($fields{$fieldId}, qw(to from cc bcc subject)) && $noMailData);
push(@row, $fields{$fieldId});
}
my $tab = join("\t",@row)."\n";
foreach my $record (@data) {
@row = ();
foreach my $fieldId (keys %fields) {
next if (isIn($fields{$fieldId}, qw(to from cc bcc subject)) && $noMailData);
my $value = $record->{$fields{$fieldId}};
$value =~ s/\t/\\t/g;
$value =~ s/\r//g;
$value =~ s/\n/;/g;
push(@row, $value);
}
$tab .= join("\t", @row)."\n";
}
return $tab;
}
#-------------------------------------------------------------------

14
lib/WebGUI/Asset/Wobject/IndexedSearch.pm
View file

@ -422,10 +422,10 @@ sub _buildFilter {
my $self = shift;
my %filter = ();
# pages
if($self->get('searchRoot') !~ /any/i) {
$filter{pageId} = $self->_buildPageList;
}
# # pages
# if($self->get('searchRoot') !~ /any/i) {
# $filter{assetId} = $self->_buildPageList;
# }
# content-types
if($session{form}{contentTypes} && ! isIn('any', $session{cgi}->param('contentTypes'))) {
@ -528,10 +528,10 @@ sub _getContentTypes {
sub _getSearchablePages {
my $searchRoot = shift;
my %pages;
my $sth = WebGUI::SQL->read("select pageId from page where parentId = ".quote($searchRoot));
my $sth = WebGUI::SQL->read("select assetId from asset where parentId = ".quote($searchRoot));
while (my %data = $sth->hash) {
$pages{$data{pageId}} = 1;
%pages = (%pages, _getSearchablePages($data{pageId}) );
$pages{$data{assetId}} = 1;
%pages = (%pages, _getSearchablePages($data{assetId}) );
}
return %pages;
}

12
lib/WebGUI/i18n/English/Snippet.pm
View file

@ -8,6 +8,11 @@ our $I18N = {
context => 'Default name of all snippets'
},
'process as template' => {
message => q|Process as template?|,
lastUpdated => 1104630516,
},
'snippet add/edit title' => {
message => q|Snippet, Add/Edit|,
lastUpdated => 1104630516,
@ -18,8 +23,13 @@ our $I18N = {
<P>Since Snippets are Assets, so they have all the properties that Assets do.</P>
<P><b>Snippet</b><br/>
<p><b>Snippet</b><br />
This is the snippet. Either type it in or copy and paste it into the form field.
</p>
<p><b>Process as template?</b><br />
This will run the snippet through the template engine. It will enable you to use session variables in the snippet, but it is a little slower.
</p>
|,
context => 'Describing snippets and its sole field.',
lastUpdated => 1106683569,