From 02a84d2df98fb240746505bd10c99a734d4c464b Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Wed, 7 Jan 2009 21:46:27 +0000
Subject: [PATCH] * Tasks in summary view are now clickable too.  I also found
 the bug report; it was an internal report at my office rather than something
 in Bugzilla.  Closed it.

---
 webcit/calendar.c      | 14 ++++++++++----
 webcit/calendar_view.c | 44 ++++++++++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/webcit/calendar.c b/webcit/calendar.c
index a80e62c16..9012e8966 100644
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -640,8 +640,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, ch
 	wprintf("<FORM METHOD=\"POST\" action=\"save_task\">\n");
 	wprintf("<div style=\"display: none;\">\n	");
 	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
-		msgnum);
+	wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n", msgnum);
+	wprintf("<INPUT TYPE=\"hidden\" NAME=\"return_to_summary\" VALUE=\"%d\">\n",
+		ibstr("return_to_summary"));
 	wprintf("</div>");
 	wprintf("<table class=\"calendar_background\"><tr><td>");
 	wprintf("<TABLE STYLE=\"border: none;\">\n");
@@ -937,8 +938,13 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum, char* from
 		icalcomponent_free(vtodo);
 	}
 
-	/** Go back to the task list */
-	readloop(readfwd);
+	/* Go back to wherever we came from */
+	if (ibstr("return_to_summary") == 1) {
+		summary();
+	}
+	else {
+		readloop(readfwd);
+	}
 }
 
 
diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 7d13d99e8..f9863836b 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -1295,19 +1295,34 @@ void calendar_summary_view(void) {
 
 				p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
 				if (p != NULL) {
-					wprintf("<a href=\"display_edit_event"
-						"?msgnum=%ld"
-						"?calview=summary"
-						"?year=%d"
-						"?month=%d"
-						"?day=%d"
-						"?gotofirst=_CALENDAR_"
-						"\">",
-						Cal->cal_msgnum,
-						today_tm.tm_year + 1900,
-						today_tm.tm_mon + 1,
-						today_tm.tm_mday
-					);
+
+
+					if (WCC->wc_view == VIEW_TASKS) {
+						wprintf("<a href=\"display_edit_task"
+							"?msgnum=%ld"
+							"?return_to_summary=1"
+							"?gotofirst=",
+							Cal->cal_msgnum
+						);
+						escputs(WCC->wc_roomname);
+						wprintf("\">");
+					}
+					else {
+						wprintf("<a href=\"display_edit_event"
+							"?msgnum=%ld"
+							"?calview=summary"
+							"?year=%d"
+							"?month=%d"
+							"?day=%d"
+							"?gotofirst=",
+							Cal->cal_msgnum,
+							today_tm.tm_year + 1900,
+							today_tm.tm_mon + 1,
+							today_tm.tm_mday
+						);
+						escputs(WCC->wc_roomname);
+						wprintf("\">");
+					}
 					escputs((char *) icalproperty_get_comment(p));
 					wprintf(" (%s)</a><br />\n", timestring);
 				}
@@ -1536,8 +1551,7 @@ void do_tasks_view(void) {
 		wprintf("disabled=\"disabled\">\n</td><td>");
 		p = icalcomponent_get_first_property(Cal->cal,
 			ICAL_SUMMARY_PROPERTY);
-		wprintf("<a href=\"display_edit_task?msgnum=%ld&amp;taskrm=",
-			Cal->cal_msgnum );
+		wprintf("<a href=\"display_edit_task?msgnum=%ld?taskrm=", Cal->cal_msgnum);
 		urlescputs(WC->wc_roomname);
 		wprintf("\">");
 		/* wprintf("<img align=middle "
-- 
2.30.2