projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d528a6d
)
Fix flipping to alternate templates, and add success flag.
author
Wilfried Goesgens
<willi@arangodb.com>
Thu, 31 Dec 2015 14:07:33 +0000
(15:07 +0100)
committer
Wilfried Goesgens
<willi@arangodb.com>
Thu, 31 Dec 2015 14:07:33 +0000
(15:07 +0100)
webcit/roomops.c
patch
|
blob
|
history
diff --git
a/webcit/roomops.c
b/webcit/roomops.c
index ae101adb80031b246c2858a4c9c304323dee44c1..874aba189a4a6a00fbfa52ddd860770c7a486386 100644
(file)
--- a/
webcit/roomops.c
+++ b/
webcit/roomops.c
@@
-716,20
+716,38
@@
void editroom(void)
const StrBuf *er_password;
const StrBuf *er_dirname;
const StrBuf *er_roomaide;
const StrBuf *er_password;
const StrBuf *er_dirname;
const StrBuf *er_roomaide;
+ const StrBuf *templ;
int succ1, succ2;
int succ1, succ2;
+ templ = sbstr("template");
if (!havebstr("ok_button")) {
if (!havebstr("ok_button")) {
+ putlbstr("success", 0);
AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
- output_headers(1, 1, 1, 0, 0, 0);
- do_template("room_edit");
- wDumpContent(1);
+ if (templ != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(templ), NULL, &NoCtx);
+ end_burst();
+ }
+ else {
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
+ }
return;
}
if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) {
return;
}
if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) {
- output_headers(1, 1, 1, 0, 0, 0);
- do_template("room_edit");
- wDumpContent(1);
+ putlbstr("success", 0);
+ if (templ != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(templ), NULL, &NoCtx);
+ end_burst();
+ }
+ else {
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
+ }
return;
}
return;
}
@@
-852,11
+870,22
@@
void editroom(void)
succ2 = SaveRoomAide (&WCC->CurRoom);
if (succ1 + succ2 == 0) {
succ2 = SaveRoomAide (&WCC->CurRoom);
if (succ1 + succ2 == 0) {
+ putlbstr("success", 1);
AppendImportantMessage (_("Your changes have been saved."), -1);
}
AppendImportantMessage (_("Your changes have been saved."), -1);
}
- output_headers(1, 1, 1, 0, 0, 0);
- do_template("room_edit");
- wDumpContent(1);
+ else {
+ putlbstr("success", 0);
+ }
+ if (templ != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(templ), NULL, &NoCtx);
+ end_burst();
+ }
+ else {
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
+ }
return;
}
return;
}
@@
-940,14
+969,24
@@
void entroom(void)
const StrBuf *er_name;
const StrBuf *er_type;
const StrBuf *er_password;
const StrBuf *er_name;
const StrBuf *er_type;
const StrBuf *er_password;
+ const StrBuf *template;
int er_floor;
int er_num_type;
int er_view;
wcsession *WCC = WC;
int er_floor;
int er_num_type;
int er_view;
wcsession *WCC = WC;
- if (!havebstr("ok_button")) {
+ template = sbstr("template");
+ if ((WCC == NULL) || !havebstr("ok_button")) {
+ putlbstr("success", 0);
AppendImportantMessage(_("Cancelled. No new room was created."), -1);
AppendImportantMessage(_("Cancelled. No new room was created."), -1);
- display_main_menu();
+ if (template != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(template), NULL, &NoCtx);
+ end_burst();
+ }
+ else {
+ display_main_menu();
+ }
return;
}
er_name = sbstr("er_name");
return;
}
er_name = sbstr("er_name");
@@
-977,8
+1016,16
@@
void entroom(void)
Line = NewStrBuf();
StrBuf_ServGetln(Line);
if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
Line = NewStrBuf();
StrBuf_ServGetln(Line);
if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
+ putlbstr("success", 0);
FreeStrBuf(&Line);
FreeStrBuf(&Line);
- display_main_menu();
+ if (template != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(template), NULL, &NoCtx);
+ end_burst();
+ }
+ else {
+ display_main_menu();
+ }
return;
}
/** TODO: Room created, now update the left hand icon bar for this user */
return;
}
/** TODO: Room created, now update the left hand icon bar for this user */
@@
-989,7
+1036,13
@@
void entroom(void)
FreeStrBuf(&Line); /* TODO: should we care about errors? */
WCC->CurRoom.view = er_view;
FreeStrBuf(&Line); /* TODO: should we care about errors? */
WCC->CurRoom.view = er_view;
- if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ) {
+ putlbstr("success", 1);
+ if (template != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(template), NULL, &NoCtx);
+ end_burst();
+ }
+ else if ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) {
output_headers(1, 1, 1, 0, 0, 0);
do_template("room_edit");
wDumpContent(1);
output_headers(1, 1, 1, 0, 0, 0);
do_template("room_edit");
wDumpContent(1);