This patch applies to HEAD and re-enables draft folders. I'm using it at home - seems to work - what was wrong with it that it was disabled?
Sam / --- forwarded message --- / > Sat Sep 04 2010 4:06:51 am EDT EDT from "Sam Liddicott" ><sam...@uncensored.citadel.org> Subject: [PATCH] Re-enable drafts > > --- > citadel/euidindex.c | 1 + > citadel/user_ops.c | 2 +- > libcitadel/lib/libcitadel.h | 1 + > webcit/static/t/edit_message.html | 2 -- > webcit/static/t/view_message.html | 2 -- > 5 files changed, 3 insertions(+), 5 deletions(-) > > > >
diff --git a/citadel/euidindex.c b/citadel/euidindex.c index 842fa1d..8ca39ee 100644 --- a/citadel/euidindex.c +++ b/citadel/euidindex.c @@ -69,6 +69,7 @@ int DoesThisRoomNeedEuidIndexing(struct ctdlroom *qrbuf) { case VIEW_BBS: return(0); case VIEW_MAILBOX: return(0); case VIEW_ADDRESSBOOK: return(1); + case VIEW_DRAFTS: return(0); case VIEW_CALENDAR: return(1); case VIEW_TASKS: return(1); case VIEW_NOTES: return(1); diff --git a/citadel/user_ops.c b/citadel/user_ops.c index 2f23c38..d68d334 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -739,7 +739,7 @@ void do_login(void) CtdlCreateRoom(MAILROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); CtdlCreateRoom(SENTITEMS, 4, "", 0, 1, 0, VIEW_MAILBOX); CtdlCreateRoom(USERTRASHROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); - /* CtdlCreateRoom(USERDRAFTROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); temporarily disabled for 7.60 */ + CtdlCreateRoom(USERDRAFTROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); /* Run any startup routines registered by loadable modules */ PerformSessionHooks(EVT_LOGIN); diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 69781b6..82c0ec6 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -103,6 +103,7 @@ typedef enum _room_views { VIEW_CALBRIEF = 7, /* Brief Calendar view */ VIEW_JOURNAL = 8, /* Journal view */ VIEW_BLOG = 9, /* Blog view */ + VIEW_DRAFTS = 10, /* Drafts view */ VIEW_MAX } ROOM_VIEWS; diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html index 600dd67..7febb91 100644 --- a/webcit/static/t/edit_message.html +++ b/webcit/static/t/edit_message.html @@ -14,10 +14,8 @@ <?!("COND:BSTR", 1, "__RCPTREQUIRED")><input type="submit" name="send_button" value="<?_("Send message")>"><?!("X", 1)> <??("COND:BSTR", 2, "__RCPTREQUIRED")><input type="submit" name="send_button" value="<?_("Post message")>"><?!("X", 2)> -<!-- temporarily disabled for 7.60 <input type="submit" name="save_button" value="<?_("Save to Drafts")>"> ---> <input type="submit" name="cancel_button" value="<?_("Cancel")>"> </p> <img src="static/newmess3_24x.gif" class="imgedit"> <?DATE:NOW:STR> diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html index aa2150e..941f98b 100644 --- a/webcit/static/t/view_message.html +++ b/webcit/static/t/view_message.html @@ -16,9 +16,7 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden <?!("COND:MAIL:SUMM:CCCC", 6)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 6)> <?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT("X")></p><??("X", 7)> <p style="visibility: hidden;" id="msg<?MAIL:SUMM:N>" class="msgbuttons"> -<!-- temporarily disabled for 7.60 <a href="display_enter?edit=<?MAIL:SUMM:N>&recp=<?MAIL:SUMM:TO("U")>&cc=<?MAIL:SUMM:CCCC("U")>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "", "")>&force_room=_MAIL_"><span>[</span><?_("Edit")><span>]</span></a> ---> <?!("COND:ROOM:TYPE_IS", 8, #"VIEW_BBS")> <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a> <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>&recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a>