merge of '973efc6b7800601981d13f7968d2b1ff1e7e5858'

and 'fc29c1b763c506067039095b47f73dfd6301f0e2'

Monotone-Parent: 973efc6b7800601981d13f7968d2b1ff1e7e5858
Monotone-Parent: fc29c1b763c506067039095b47f73dfd6301f0e2
Monotone-Revision: e7b81958c4674e9abdea432ddd234af617b11eda

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-08-18T01:56:12
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-08-18 01:56:12 +00:00
4 changed files with 13 additions and 6 deletions

View File

@@ -1,3 +1,11 @@
2009-08-18 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoGCSFolder.m
(-initializeQuickTablesAclsInContext:): don't give the right to
view everything to users who can delete objects. This may cause
deletion from working from a web method, but everyone who uses
such as configuration will probably use DAV instead.
2009-08-18 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxCalendarProperties.m ([UIxCalendarProperties

View File

@@ -1171,10 +1171,8 @@ static NSArray *childRecordFields = nil;
/* we only grant "userCanAccessAllObjects" for role "ObjectEraser" and
not "ObjectCreator" because the latter doesn't imply we can read
properties from subobjects or even know their existence. */
userCanAccessAllObjects = ([[self ownerInContext: localContext]
isEqualToString: login]
|| [[self aclsForUser: login]
containsObject: SOGoRole_ObjectEraser]);
userCanAccessAllObjects
= [[self ownerInContext: localContext] isEqualToString: login];
}
}

2
debian/control vendored
View File

@@ -8,7 +8,7 @@ Standards-Version: 3.8.2
Package: sogo
Section: web
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, apache2
Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper
Suggests: nginx
Description: a modern and scalable groupware
SOGo is a groupware server built around OpenGroupware.org (OGo) and

3
debian/rules vendored
View File

@@ -49,7 +49,8 @@ install-arch: build-arch
cp Scripts/sogod-wrapper debian/tmp/usr/sbin/sogod-wrapper
mkdir -p debian/tmp/usr/share/lintian/overrides
cp debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo
cp Apache/SOGo-debian.conf /etc/apache2/conf.d/SOGo.conf
mkdir -p debian/tmp/etc/apache2/conf.d
cp Apache/SOGo-debian.conf debian/tmp/etc/apache2/conf.d/SOGo.conf
binary-indep: build-indep install-indep