gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3 t_kronolith_HK_GW_ZpushAnnotations.diff, 1.2, 1.3
cvs at kolab.org
cvs at kolab.org
Wed Jun 9 15:36:14 CEST 2010
- Previous message: gunnar: server/kolab-webclient ChangeLog, 1.10.2.21, 1.10.2.22 Makefile, 1.6.2.3, 1.6.2.4 activesync_conf.patch, 1.1.2.2, 1.1.2.3 kolab-webclient.spec, 1.23.2.23, 1.23.2.24
- Next message: gunnar: server/kolab-webclient/turba/patches/turba-2.3.3 t_turba_HK_GW_ZpushAnnotations.diff, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3
In directory doto:/tmp/cvs-serv29677/kolab-webclient/kronolith/patches/kronolith-2.3.3
Modified Files:
t_kronolith_HK_GW_ZpushAnnotations.diff
Log Message:
Merged Zpush configuration frontend fixes to HEAD.
Index: t_kronolith_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3/t_kronolith_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t_kronolith_HK_GW_ZpushAnnotations.diff 7 Jun 2010 15:44:00 -0000 1.2
+++ t_kronolith_HK_GW_ZpushAnnotations.diff 9 Jun 2010 13:36:12 -0000 1.3
@@ -48,17 +48,19 @@
diff -Naur a/lib/Forms/EditCalendar.php b/lib/Forms/EditCalendar.php
--- a/lib/Forms/EditCalendar.php 2010-05-04 22:00:36.210910903 +0200
+++ b/lib/Forms/EditCalendar.php 2010-05-05 10:30:48.073386331 +0200
-@@ -40,22 +40,56 @@
+@@ -40,22 +40,57 @@
parent::Horde_Form($vars, sprintf(_("Edit %s"), $calendar->get('name')));
$this->addHidden('', 'c', 'text', true);
- $this->addVariable(_("Name"), 'name', 'text', true);
+ if ($this->_calendar->get('owner') != Auth::getAuth()) {
+ $this->addVariable(_("Name"), 'name', 'text', false, true);
++ $this->addVariable(_("Description"), 'description', 'longtext', false, true);
+ } else {
+ $this->addVariable(_("Name"), 'name', 'text', true);
++ $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+ }
- $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+- $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
- $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null,
- array(array(_("owners/administrators"), _("readers"), _("no one")),
- 'This calendar is only included into the free/busy data for ...'));
- Previous message: gunnar: server/kolab-webclient ChangeLog, 1.10.2.21, 1.10.2.22 Makefile, 1.6.2.3, 1.6.2.4 activesync_conf.patch, 1.1.2.2, 1.1.2.3 kolab-webclient.spec, 1.23.2.23, 1.23.2.24
- Next message: gunnar: server/kolab-webclient/turba/patches/turba-2.3.3 t_turba_HK_GW_ZpushAnnotations.diff, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list