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

- fix [ 1292597 ] Trash not emptied

Browse source 
- fix [ 1292209 ] purgeTree called in runHourly.pl (6.7.4)
 - fix [ 1290600 ] 6.6.5-6.7.0 upgrade script (fix) (Nicklous Roberts)
 - fix [ 1288786 ] Names of copied style templates doesnt update.
 - fix [ 1292538 ] Template::getList isn't versioned
 - fix [ 1241451 ] Images not showing up in TinyMCE
 - fix [ 1252786 ] rich edit ie image problem
 - fix [ 1284248 ] runHourly.pl moving assets I don't want in trash to trash
This commit is contained in:
JT Smith 2005-09-19 22:31:07 +00:00
parent 2ca63a85fb
commit 104ee36535
6 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,15 @@
- fix [ 1293947 ] 6.7.3 Cannot use a second AssetProxy with IE, Stack overflow (Wouter van Oijen / ProcoliX)
- Added a few more performance enhanceers which can cut the number of
database queries per page in half in some cases.
- fix [ 1292597 ] Trash not emptied
- fix [ 1292209 ] purgeTree called in runHourly.pl (6.7.4)
- fix [ 1290600 ] 6.6.5-6.7.0 upgrade script (fix) (Nicklous Roberts)
- fix [ 1288786 ] Names of copied style templates doesnt update.
- fix [ 1292538 ] Template::getList isn't versioned
- fix [ 1241451 ] Images not showing up in TinyMCE
- fix [ 1252786 ] rich edit ie image problem
- fix [ 1284248 ] runHourly.pl moving assets I don't want in trash to trash
6.7.4
- fix [ 1279861 ] POD errors in 6.7.3

2
docs/upgrades/upgrade_6.6.5-6.7.0.pl
View file

@ -235,7 +235,7 @@ sub addAssetVersioning {
}
WebGUI::SQL->write("create table assetData (
assetId varchar(22) not null,
revisionDate bigint,
revisionDate bigint not null,
revisedBy varchar(22) not null,
tagId varchar(22) not null,
status varchar(35) not null default 'pending',

4
lib/WebGUI/Asset/RichEdit.pm
View file

@ -400,7 +400,9 @@ sub getRichEditor {
mode => "exact",
elements => $nameId,
theme => "advanced",
document_base_url => "/",
relative_urls => "false",
# remove_script_host => "false",
# document_base_url => "/",
auto_reset_designmode => "true",
cleanup_callback => "tinyMCE_WebGUI_Cleanup",
urlconvertor_callback => "tinyMCE_WebGUI_URLConvertor",

9
lib/WebGUI/Asset/Template.pm
View file

@ -199,7 +199,14 @@ Specify the namespace to build the list for.
sub getList {
my $class = shift;
my $namespace = shift;
return WebGUI::SQL->buildHashRef("select assetData.assetId,assetData.title from template left join asset on asset.assetId=template.assetId left join assetData on asset.assetId=assetData.assetId where template.namespace=".quote($namespace)." and template.showInForms=1 and asset.state='published' and (assetData.status='approved' or assetData.tagId=".quote($session{scratch}{versionTag}).") group by assetData.assetId order by assetData.title",WebGUI::SQL->getSlave);
my $sth = WebGUI::SQL->read("select asset.assetId, max(assetData.revisionDate) from template left join asset on asset.assetId=template.assetId left join assetData on assetData.revisionDate=template.revisionDate and assetData.assetId=template.assetId where template.namespace=".quote($namespace)." and template.showInForms=1 and asset.state='published' and (assetData.status='approved' or assetData.tagId=".quote($session{scratch}{versionTag}).") group by assetData.assetId order by assetData.title",WebGUI::SQL->getSlave);
my %templates;
tie %templates, 'Tie::IxHash';
while (my ($id, $version) = $sth->array) {
$templates{$id} = WebGUI::Asset::Template->new($id,undef,$version)->getTitle;
}
$sth->finish;
return \%templates;
}

2
sbin/Hourly/TrashExpiredContent.pm
View file

@ -25,7 +25,7 @@ sub process {
asset.assetId=assetData.assetId where assetData.endDate<".$epoch." group by assetData.assetId");
while (my ($assetId, $class, $version) = $sth->array) {
my $asset = WebGUI::Asset->new($assetId,$class,$version);
$asset->trash;
$asset->trash if ($asset->get("endDate") < $epoch);
}
$sth->finish;
}

3
www/extras/tinymce/jscripts/webgui.js
View file

@ -2,13 +2,14 @@
function tinyMCE_WebGUI_URLConvertor(url, node, on_save) {
// The next line would have tried formatting the URL, but we don't want it to
//url = tinyMCE.convertURL(url, node, on_save);
url = tinyMCE.convertURL(url, node, on_save);
// Do custom WebUI convertion, replace back ^();
url = url.replace(new RegExp("%5E", "g"), "^");
url = url.replace(new RegExp("%3B", "g"), ";");
url = url.replace(new RegExp("%28", "g"), "(");
url = url.replace(new RegExp("%29", "g"), ")");
url = url.replace(/^\/\^/,"^");
url = url.replace(/http:\/\/\//,"/");
return url;
}