gunnar: server/horde/horde HK-GW-Deleting_categories.patch, NONE, 1.1 ChangeLog, 1.3, 1.4 horde-kolab.spec, 1.20, 1.21

cvs at kolab.org cvs at kolab.org
Mon Nov 19 20:35:46 CET 2007


Author: gunnar

Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv5954

Modified Files:
	ChangeLog horde-kolab.spec 
Added Files:
	HK-GW-Deleting_categories.patch 
Log Message:
kolab/issue2101

--- NEW FILE: HK-GW-Deleting_categories.patch ---
Fix deleting categories.

diff -r 8ec1fe533f3c horde/templates/prefs/categorymanagement.inc
--- a/horde/templates/prefs/categorymanagement.inc	Mon Nov 19 14:58:02 2007 +0100
+++ b/horde/templates/prefs/categorymanagement.inc	Mon Nov 19 15:00:34 2007 +0100
@@ -1,12 +1,12 @@
 <script type="text/javascript">
-function remove(category)
+function removeCategory(category)
 {
     document.prefs.cAction.value = 'remove';
     document.prefs.category.value = category;
     document.prefs.submit();
 }
 
-function add()
+function addCategory()
 {
     var category = window.prompt('<?php echo addslashes(_("Please enter a name for the new category:")) ?>', '');
     if (category != null && category != '') {
@@ -18,7 +18,7 @@ function add()
 </script>
 <input name="cAction" value="" type="hidden" />
 <input name="category" value="" type="hidden" />
-<input type="button" class="button" value="<?php echo _("New Category") ?>" onclick="add();" />
+<input type="button" class="button" value="<?php echo _("New Category") ?>" onclick="addCategory();" />
 <table>
 <?php
 
@@ -75,7 +75,7 @@ foreach ($categories as $name):
     <a href="#" onclick="new ColorPicker({ color: '<?php echo htmlspecialchars($color) ?>', offsetParent: Event.element(event), update: [['color_<?php echo $color_b ?>', 'value'], ['color_<?php echo $color_b ?>', 'background']] }); return false;">
     <?php echo Horde::img('colorpicker.png', _("Color Picker"), 'height="16"', $registry->getImageDir('horde')) ?></a>
     <?php endif; ?>
-    <a href="#" onclick="remove(decodeURIComponent('<?php echo rawurlencode(String::convertCharset($name, NLS::getCharset(), 'UTF-8')) ?>')); return false;"><?php echo Horde::img('delete.png') ?></a>
+    <a href="#" onclick="removeCategory(decodeURIComponent('<?php echo rawurlencode(String::convertCharset($name, NLS::getCharset(), 'UTF-8')) ?>')); return false;"><?php echo Horde::img('delete.png') ?></a>
   </td>
  </tr>
 <?php endforeach; ?>

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	20 Jul 2007 11:19:08 -0000	1.3
+++ ChangeLog	19 Nov 2007 19:35:44 -0000	1.4
@@ -1,3 +1,9 @@
+2007-11-19  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-kolab.spec:
+
+	kolab/issue2101 ([horde] can’t delete categories.)
+
 2007-07-19  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-kolab.spec: Update to 20070719

Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- horde-kolab.spec	7 Nov 2007 10:37:53 -0000	1.20
+++ horde-kolab.spec	19 Nov 2007 19:35:44 -0000	1.21
@@ -3,7 +3,7 @@
 %define         V_package %{V_horde_name}-kolab
 %define         V_year  2007
 %define         V_month 11
-%define         V_day   01
+%define         V_day   19
 %define         V_version 3.2_alpha
 %define         V_uver    3.2-alpha
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -28,6 +28,9 @@
 Source3:        conf.php
 Source4:        registry.php
 
+# List of Patches
+Patch0:         HK-GW-Deleting_categories.patch
+
 # Build Info
 Prefix:		%{l_prefix}
 BuildRoot:	%{l_buildroot}
@@ -63,6 +66,10 @@
 
 %prep
 	%setup -c -q -n %{V_horde_name}-%{V_uver}
+
+	cd %{V_horde_name}-%{V_uver}
+	%patch -p2 -P 0
+	cd ..
 
 %build
 





More information about the commits mailing list