| 1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade |
| 2 |
--- smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade 2008-06-24 18:33:30.000000000 -0500 |
| 3 |
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade 2008-09-29 21:07:48.000000000 -0500 |
| 4 |
@@ -144,6 +144,18 @@ |
| 5 |
$statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 6 |
} |
| 7 |
|
| 8 |
+unless (defined $nag_shares_groups->{group_uid}) |
| 9 |
+{ |
| 10 |
+ # We need to be careful about this one as it will fail if the |
| 11 |
+ # column exists, so we check the error. |
| 12 |
+ my $statement = |
| 13 |
+ "ALTER TABLE nag_shares_groups ADD group_uid VARCHAR(255) ". |
| 14 |
+ "NOT NULL"; |
| 15 |
+ $statement = $db_naghandle->prepare($statement) or |
| 16 |
+ die "prepare: $$statement: $DBI::errstr"; |
| 17 |
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 18 |
+} |
| 19 |
+ |
| 20 |
# Create an index for task_owner if needed |
| 21 |
unless ($nag_tasks->{task_owner}->{Key}) |
| 22 |
{ |
| 23 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header |
| 24 |
--- smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header 2008-05-13 19:46:58.000000000 -0500 |
| 25 |
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header 2008-09-29 21:08:26.000000000 -0500 |
| 26 |
@@ -1,6 +1,6 @@ |
| 27 |
//00Header |
| 28 |
/** |
| 29 |
- * $Horde: nag/config/prefs.php.dist,v 1.42.2.8 2008/02/13 19:56:58 chuck Exp $ |
| 30 |
+ * $Horde: nag/config/prefs.php.dist,v 1.42.2.10 2008/07/02 16:15:45 jan Exp $ |
| 31 |
* |
| 32 |
* See horde/config/prefs.php for documentation on the structure of this file. |
| 33 |
*/ |
| 34 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display |
| 35 |
--- smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display 2008-04-06 19:18:59.000000000 -0500 |
| 36 |
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display 2008-09-29 21:15:00.000000000 -0500 |
| 37 |
@@ -3,6 +3,7 @@ |
| 38 |
'column' => _("General Options"), |
| 39 |
'label' => _("Display Options"), |
| 40 |
'desc' => _("Change your task sorting and display options."), |
| 41 |
- 'members' => array('show_tasklist', 'show_panel', 'sortby', 'altsortby', 'sortdir'), |
| 42 |
+ 'members' => array('tasklist_columns', 'show_panel', 'sortby', 'altsortby', |
| 43 |
+ 'sortdir'), |
| 44 |
); |
| 45 |
|
| 46 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/170ShowTaskList mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/170ShowTaskList |
| 47 |
--- smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/170ShowTaskList 2008-05-13 19:49:36.000000000 -0500 |
| 48 |
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/170ShowTaskList 2008-09-29 21:15:38.000000000 -0500 |
| 49 |
@@ -1,10 +1,15 @@ |
| 50 |
-//170ShowTaskList |
| 51 |
-// show a task list column in the list view? |
| 52 |
-$_prefs['show_tasklist'] = array( |
| 53 |
- 'value' => 0, |
| 54 |
+//170Tasklist_Columns |
| 55 |
+// columns in the list view |
| 56 |
+$_prefs['tasklist_columns'] = array( |
| 57 |
+ 'value' => 'a:3:\{i:0;s:8:"priority";i:1;s:3:"due";i:2;s:8:"category";\}', |
| 58 |
'locked' => false, |
| 59 |
'shared' => false, |
| 60 |
- 'type' => 'checkbox', |
| 61 |
- 'desc' => _("Should the Task List be shown in its own column in the List view?") |
| 62 |
+ 'type' => 'multienum', |
| 63 |
+ 'enum' => array('tasklist' => _("Task List"), |
| 64 |
+ 'priority' => _("Priority"), |
| 65 |
+ 'assignee' => _("Assignee"), |
| 66 |
+ 'due' => _("Due Date"), |
| 67 |
+ 'category' => _("Category")), |
| 68 |
+ 'desc' => _("Select the columns that should be shown in the list view:") |
| 69 |
); |
| 70 |
|
| 71 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/190SortBy mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/190SortBy |
| 72 |
--- smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/190SortBy 2008-05-13 19:50:58.000000000 -0500 |
| 73 |
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/190SortBy 2008-09-29 21:18:30.000000000 -0500 |
| 74 |
@@ -10,6 +10,7 @@ |
| 75 |
NAG_SORT_CATEGORY => _("Category"), |
| 76 |
NAG_SORT_DUE => _("Due Date"), |
| 77 |
NAG_SORT_COMPLETION => _("Completed?"), |
| 78 |
+ NAG_SORT_ASSIGNEE => _("Assignee"), |
| 79 |
NAG_SORT_OWNER => _("Task List")), |
| 80 |
'desc' => _("Sort tasks by:"), |
| 81 |
); |
| 82 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/200AltSortBy mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/200AltSortBy |
| 83 |
--- smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/200AltSortBy 2008-05-13 19:51:17.000000000 -0500 |
| 84 |
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/200AltSortBy 2008-09-29 21:18:44.000000000 -0500 |
| 85 |
@@ -10,6 +10,7 @@ |
| 86 |
NAG_SORT_CATEGORY => _("Category"), |
| 87 |
NAG_SORT_DUE => _("Due Date"), |
| 88 |
NAG_SORT_COMPLETION => _("Completed?"), |
| 89 |
+ NAG_SORT_ASSIGNEE => _("Assignee"), |
| 90 |
NAG_SORT_OWNER => _("Task List")), |
| 91 |
'desc' => _("Then:"), |
| 92 |
); |
| 93 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql mezzanine_patched_smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql |
| 94 |
--- smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql 2008-06-18 22:56:48.000000000 -0500 |
| 95 |
+++ mezzanine_patched_smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql 2008-09-29 21:06:57.000000000 -0500 |
| 96 |
@@ -37,7 +37,7 @@ |
| 97 |
|
| 98 |
CREATE TABLE IF NOT EXISTS nag_shares_groups ( |
| 99 |
share_id INT NOT NULL, |
| 100 |
- group_uid INT NOT NULL, |
| 101 |
+ group_uid VARCHAR(255) NOT NULL, |
| 102 |
perm SMALLINT NOT NULL |
| 103 |
); |
| 104 |
|
Parent Directory
| 
Revision Log
| 
Revision Graph
