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

- fix [ 1373707 ] File Pile not uploading images

Browse source 
- fix [ 1353425 ] getUsersInGroup includes expired Group of group members (Ed
   van Duinen)
 - fix [ 1373041 ] context menus in Admin Mode don't position correctly in IE
   ( Michele Dell'Aquila)
This commit is contained in:
JT Smith 2005-12-07 00:07:25 +00:00
parent d42cc1aeee
commit 9549d37033
5 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,11 @@
6.8.1
- Removed duplicate processing of metadata.
- fix [ 1373649 ] Username isn't populated in 6.8.0 Discussions
- fix [ 1373707 ] File Pile not uploading images
- fix [ 1353425 ] getUsersInGroup includes expired Group of group members (Ed
van Duinen)
- fix [ 1373041 ] context menus in Admin Mode don't position correctly in IE
( Michele Dell'Aquila)
- Upgraded TinyMCE to 2.0.1, which allows the rich editor to work with
Firefox 1.5.
- Added test class for User.pm (Roy Johnson / Ocean View Web Creations)

3
docs/credits.txt
View file

@ -14,6 +14,7 @@ Contributing Developers..............Peter Beardsley / Appropriate Solutions
Richard Clark
Doug Collinge
Flavio Curti
Michele Dell'Aquila / CSU
Jeff Depons / Adaptive Dynamics
Frank Dillon / Plain Black
Arne Dokken
@ -23,7 +24,7 @@ Contributing Developers..............Peter Beardsley / Appropriate Solutions
Chris Gebhardt / OpenServe
Andy Grundman
Chris Jackson
Roy Johnson / Ocean View Creations
Roy Johnson / Ocean View Web Creations
Koen de Jonge / ProcoliX
Martin Kamerbeek / ProcoliX
Christian Kocourek

1
lib/WebGUI/Asset/FilePile.pm
View file

@ -179,6 +179,7 @@ sub editSave {
delete $newAsset->{_storageLocation};
$newAsset->setSize($storage->getFileSize($filename));
$newAsset->generateThumbnail if ($className eq "WebGUI::Asset::File::Image");
$newAsset->commit;
}
$tempStorage->delete;
return $class->getParent->www_manageAssets if ($session{form}{proceed} eq "manageAssets");

10
lib/WebGUI/Grouping.pm
View file

@ -320,10 +320,16 @@ sub getUsersInGroup {
$clause = "expireDate > ".time()." and ";
}
$clause .= "(groupId=".quote($groupId);
if ($recursive) {
if ($recursive) {
my $groups = getGroupsInGroup($groupId,1);
if ($#$groups >= 0) {
$clause .= " or groupId in (".quoteAndJoin($groups).")";
if ($withoutExpired) {
foreach my $groupId (@$groups) {
$clause .= " OR (groupId = ".quote($groupId)." AND expireDate > ".time().") ";
}
} else {
$clause .= " OR groupId IN (".quoteAndJoin(',',@$groups).")";
}
}
}
$clause .= ")";

5
www/extras/contextMenu/contextMenu.js
View file

@ -30,8 +30,9 @@ var firedobj = ie5?e.srcElement:e.target;
yoffset+=firedobj.offsetTop;}
firedobj=firedobj.offsetParent;
}
posx = e.clientX - xoffset + (ie5? document.body.scrollLeft : window.pageXOffset);
posy = e.clientY - yoffset + (ie5? document.body.scrollTop : window.pageYOffset);
var el = document.documentElement;
posx = e.clientX - xoffset + (ie5? el.scrollLeft : window.pageXOffset);
posy = e.clientY - yoffset + (ie5? el.scrollTop : window.pageYOffset);
menuobj.style.left=posx;
menuobj.style.top=posy;
menuobj.style.visibility="visible"