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

*** empty log message ***

Browse source
This commit is contained in:
Matthew Wilson 2005-08-18 15:05:48 +00:00
parent 612e3d712e
commit 8e2f4a5295
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,7 @@
- fix [ 1256549 ] Users are allowed to set url to extras or uploads
- fix [ 1262505 ] Unable to edit group info
- Added the missing export toolbar icon.
- fix [ 1261789 ] fixed(?) can't edit collaboration (Collaboration.pm) (andreasg)
6.7.0

2
docs/upgrades/upgrade_6.7.0-6.7.1.pl
View file

@ -35,7 +35,7 @@ WebGUI::Session::close();
sub fixForumRichEdit {
print "\tFixing the forum rich editor properties.\n" unless ($quiet);
my $validElements = 'a[name|href|target|title],strong/b[class],em/i[class],strike[class],u[class],p[dir|class|align],ol,ul,li,br,img[class|src|border=0|alt|title|hspace|vspace|width|height|align],sub,sup,blockquote[dir|style],table[border=0|cellspacing|cellpadding|width|height|class|align],tr[class|rowspan|width|height|align|valign],td[dir|class|colspan|rowspan|width|height|align|valign],div[dir|class|align],span[class|align],pre[class|align],address[class|align],h1[dir|class|align],h2[dir|class|align],h3[dir|class|align],h4[dir|class|align],h5[dir|class|align],h6[dir|class|align],hr';
WebGUI::SQL->write("update RichEdit set validElements=".quote($prepend)." where assetId='PBrichedit000000000002'");
WebGUI::SQL->write("update RichEdit set validElements=".quote($validElements)." where assetId='PBrichedit000000000002'");
WebGUI::SQL->write("update assetData set endDate=".(time()+60*60*24*365*20)." where assetId='PBrichedit000000000002'");
}

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

@ -584,7 +584,7 @@ sub getEditForm {
-name=>"richEditor",
-label=>WebGUI::International::get('rich editor', 'Asset_Collaboration'),
-hoverHelp=>WebGUI::International::get('rich editor description', 'Asset_Collaboration'),
-options=>WebGUI::SQL->buildHashRef("select assetId, title from asset where className='WebGUI::Asset::RichEdit' order by title"),
-options=>WebGUI::SQL->buildHashRef("select distinct(assetData.assetId), assetData.title from asset, assetData where asset.className='WebGUI::Asset::RichEdit' and asset.assetId=assetData.assetId order by assetData.title"),
-value=>[$self->getValue("richEditor")]
);
$tabform->getTab("display")->yesNo(