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

Merge branch 'master' of git@github.com:plainblack/webgui

Browse source 
Conflicts:
	docs/changelog/7.x.x.txt
	docs/upgrades/upgrade_7.7.19-7.8.0.pl
This commit is contained in:
Doug Bell 2009-09-09 17:26:55 -05:00
commit 65120a61cb
21 changed files with 354 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -472,7 +472,8 @@ sub getCompareForm {
}
else{
$maxComparisons = $self->get('maxComparisonsPrivileged');
}
}
$maxComparisons += 0;
$form .= "\n<script type='text/javascript'>\n".
'var maxComparisons = '.$maxComparisons.";\n".
"var matrixUrl = '".$self->getUrl."';\n".
@ -664,6 +665,7 @@ sub view {
else{
$maxComparisons = $self->get('maxComparisonsPrivileged');
}
$maxComparisons += 0;
$var->{maxComparisons} = $maxComparisons;
if ($self->canEdit){
@ -912,6 +914,7 @@ sub www_compare {
else{
$maxComparisons = $self->get('maxComparisonsPrivileged');
}
$maxComparisons += 0;
foreach my $listingId (@listingIds){
my $listingId_safe = $listingId;

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

@ -221,7 +221,7 @@ sub exportAssetCollateral {
my $printSession = WebGUI::Session->open(
$self->session->config->getWebguiRoot,
$self->session->config->getFilename,
$self->session->request,
undef,
undef,
$self->session->getId,
);