Fixed Mantis102: Apache2 deb issue and Mantis90: Remember if we show completed tasks
Monotone-Parent: f49ae822ce1ffd032a2522ecf1d1c4fd425678b1 Monotone-Revision: 27c3e7606471d513ab1014e7afa4c56071c0245e Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-08-17T20:07:54 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
5915f09471
commit
6524ffc078
|
@ -0,0 +1,46 @@
|
||||||
|
Alias /sogo.woa/WebServerResources/ \
|
||||||
|
/usr/lib/GNUstep/SOGo/WebServerResources/
|
||||||
|
Alias /SOGo.woa/WebServerResources/ \
|
||||||
|
/usr/lib/GNUstep/SOGo/WebServerResources/
|
||||||
|
Alias /SOGO.woa/WebServerResources/ \
|
||||||
|
/usr/lib/GNUstep/SOGo/WebServerResources/
|
||||||
|
|
||||||
|
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*jpg">
|
||||||
|
SetHandler default-handler
|
||||||
|
</LocationMatch>
|
||||||
|
|
||||||
|
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*png">
|
||||||
|
SetHandler default-handler
|
||||||
|
</LocationMatch>
|
||||||
|
|
||||||
|
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*gif">
|
||||||
|
SetHandler default-handler
|
||||||
|
</LocationMatch>
|
||||||
|
|
||||||
|
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*css">
|
||||||
|
SetHandler default-handler
|
||||||
|
</LocationMatch>
|
||||||
|
|
||||||
|
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*js">
|
||||||
|
SetHandler default-handler
|
||||||
|
</LocationMatch>
|
||||||
|
|
||||||
|
AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
|
||||||
|
/usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2
|
||||||
|
|
||||||
|
<Proxy balancer://sogocluster>
|
||||||
|
BalancerMember http://127.0.0.1:20000 retry=1 max=1 timeout=120
|
||||||
|
# If you enable those, don't forget the enable the spawning of multiple SOGo
|
||||||
|
# processes. With Redhat-based distributions, this is done by setting the
|
||||||
|
# "PREFORK" variable in /etc/sysconfig/sogo to the amount of processes as
|
||||||
|
# value.
|
||||||
|
# BalancerMember http://127.0.0.1:20001 retry=1 max=1 timeout=120
|
||||||
|
# BalancerMember http://127.0.0.1:20002 retry=1 max=1 timeout=120
|
||||||
|
ProxySet lbmethod=byrequests maxattempts=1
|
||||||
|
Order allow,deny
|
||||||
|
Allow from all
|
||||||
|
</Proxy>
|
||||||
|
|
||||||
|
SetEnv proxy-nokeepalive 1
|
||||||
|
ProxyRequests Off
|
||||||
|
ProxyPass /SOGo balancer://sogocluster/SOGo
|
|
@ -1,3 +1,8 @@
|
||||||
|
2009-08-17 Cyril Robert <crobert@inverse.ca>
|
||||||
|
|
||||||
|
* UI/Scheduler/UIxCalListingActions.m: Added support for new user default:
|
||||||
|
ShowCompletedTasks.
|
||||||
|
|
||||||
2009-08-17 Ludovic Marcotte <lmarcotte@inverse.ca>
|
2009-08-17 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||||
|
|
||||||
* SoObjects/SOGo/LDAPSource.m
|
* SoObjects/SOGo/LDAPSource.m
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#import <Foundation/NSString.h>
|
#import <Foundation/NSString.h>
|
||||||
#import <Foundation/NSTimeZone.h>
|
#import <Foundation/NSTimeZone.h>
|
||||||
#import <Foundation/NSValue.h>
|
#import <Foundation/NSValue.h>
|
||||||
|
#import <Foundation/NSUserDefaults.h>
|
||||||
|
|
||||||
#import <NGObjWeb/WOContext.h>
|
#import <NGObjWeb/WOContext.h>
|
||||||
#import <NGObjWeb/WOContext+SoObjects.h>
|
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||||
|
@ -967,9 +968,10 @@ _computeBlocksPosition (NSArray *blocks)
|
||||||
|
|
||||||
- (WOResponse *) tasksListAction
|
- (WOResponse *) tasksListAction
|
||||||
{
|
{
|
||||||
|
NSUserDefaults *ud;
|
||||||
NSEnumerator *tasks;
|
NSEnumerator *tasks;
|
||||||
NSMutableArray *filteredTasks, *filteredTask;
|
NSMutableArray *filteredTasks, *filteredTask;
|
||||||
BOOL showCompleted;
|
BOOL showCompleted, setUserDefault;
|
||||||
NSArray *task;
|
NSArray *task;
|
||||||
int statusCode;
|
int statusCode;
|
||||||
unsigned int endDateStamp;
|
unsigned int endDateStamp;
|
||||||
|
@ -982,6 +984,15 @@ _computeBlocksPosition (NSArray *blocks)
|
||||||
tasks = [[self _fetchFields: tasksFields
|
tasks = [[self _fetchFields: tasksFields
|
||||||
forComponentOfType: @"vtodo"] objectEnumerator];
|
forComponentOfType: @"vtodo"] objectEnumerator];
|
||||||
showCompleted = [[request formValueForKey: @"show-completed"] intValue];
|
showCompleted = [[request formValueForKey: @"show-completed"] intValue];
|
||||||
|
setUserDefault = [[request formValueForKey: @"setud"] intValue];
|
||||||
|
if (setUserDefault)
|
||||||
|
{
|
||||||
|
ud = [[context activeUser] userDefaults];
|
||||||
|
[ud setObject: [NSNumber numberWithInt: showCompleted]
|
||||||
|
forKey: @"ShowCompletedTasks"];
|
||||||
|
[ud synchronize];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
while (task = [tasks nextObject])
|
while (task = [tasks nextObject])
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,7 +7,7 @@ var listFilter = 'view_today';
|
||||||
var listOfSelection = null;
|
var listOfSelection = null;
|
||||||
var selectedCalendarCell;
|
var selectedCalendarCell;
|
||||||
|
|
||||||
var showCompletedTasks = 0;
|
var showCompletedTasks;;
|
||||||
|
|
||||||
var currentDay = '';
|
var currentDay = '';
|
||||||
|
|
||||||
|
@ -1354,9 +1354,12 @@ function refreshEvents() {
|
||||||
+ "&filterpopup=" + listFilter);
|
+ "&filterpopup=" + listFilter);
|
||||||
}
|
}
|
||||||
|
|
||||||
function refreshTasks() {
|
function refreshTasks(setUserDefault) {
|
||||||
|
var url = "taskslist?show-completed=" + showCompletedTasks;
|
||||||
|
if (setUserDefault == 1)
|
||||||
|
url += "&setud=1";
|
||||||
refreshAlarms();
|
refreshAlarms();
|
||||||
return _loadTasksHref("taskslist?show-completed=" + showCompletedTasks);
|
return _loadTasksHref(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
function refreshEventsAndDisplay() {
|
function refreshEventsAndDisplay() {
|
||||||
|
@ -1560,7 +1563,7 @@ function changeMonthCalendarDisplayOfSelectedDay(node) {
|
||||||
function onShowCompletedTasks(event) {
|
function onShowCompletedTasks(event) {
|
||||||
showCompletedTasks = (this.checked ? 1 : 0);
|
showCompletedTasks = (this.checked ? 1 : 0);
|
||||||
|
|
||||||
return refreshTasks();
|
return refreshTasks(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateTaskStatus(event) {
|
function updateTaskStatus(event) {
|
||||||
|
@ -2039,6 +2042,8 @@ function configureLists() {
|
||||||
|
|
||||||
var input = $("showHideCompletedTasks");
|
var input = $("showHideCompletedTasks");
|
||||||
input.observe("click", onShowCompletedTasks);
|
input.observe("click", onShowCompletedTasks);
|
||||||
|
if (showCompletedTasks)
|
||||||
|
input.checked = true;
|
||||||
|
|
||||||
list = $("eventsList");
|
list = $("eventsList");
|
||||||
list.multiselect = true;
|
list.multiselect = true;
|
||||||
|
@ -2123,6 +2128,7 @@ function drawNowLine () {
|
||||||
function initCalendars() {
|
function initCalendars() {
|
||||||
sorting["attribute"] = "start";
|
sorting["attribute"] = "start";
|
||||||
sorting["ascending"] = true;
|
sorting["ascending"] = true;
|
||||||
|
showCompletedTasks = UserDefaults['ShowCompletedTasks'];
|
||||||
|
|
||||||
if (!$(document.body).hasClassName("popup")) {
|
if (!$(document.body).hasClassName("popup")) {
|
||||||
var node = $("filterpopup");
|
var node = $("filterpopup");
|
||||||
|
|
|
@ -8,7 +8,7 @@ Standards-Version: 3.8.2
|
||||||
Package: sogo
|
Package: sogo
|
||||||
Section: web
|
Section: web
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper
|
Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, apache2
|
||||||
Suggests: nginx
|
Suggests: nginx
|
||||||
Description: a modern and scalable groupware
|
Description: a modern and scalable groupware
|
||||||
SOGo is a groupware server built around OpenGroupware.org (OGo) and
|
SOGo is a groupware server built around OpenGroupware.org (OGo) and
|
||||||
|
|
|
@ -49,6 +49,7 @@ install-arch: build-arch
|
||||||
cp Scripts/sogod-wrapper debian/tmp/usr/sbin/sogod-wrapper
|
cp Scripts/sogod-wrapper debian/tmp/usr/sbin/sogod-wrapper
|
||||||
mkdir -p debian/tmp/usr/share/lintian/overrides
|
mkdir -p debian/tmp/usr/share/lintian/overrides
|
||||||
cp debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo
|
cp debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo
|
||||||
|
cp Apache/SOGo-debian.conf /etc/apache2/conf.d/SOGo.conf
|
||||||
|
|
||||||
binary-indep: build-indep install-indep
|
binary-indep: build-indep install-indep
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue