diff options
| -rw-r--r-- | Tools/faqwiz/faqconf.py | 14 | ||||
| -rw-r--r-- | Tools/faqwiz/faqwiz.py | 11 |
2 files changed, 17 insertions, 8 deletions
diff --git a/Tools/faqwiz/faqconf.py b/Tools/faqwiz/faqconf.py index 67a8c5b..fe3ca4b 100644 --- a/Tools/faqwiz/faqconf.py +++ b/Tools/faqwiz/faqconf.py @@ -49,7 +49,7 @@ entries marked with * were changed within the last 7 days.) # Version -- don't change unless you edit faqwiz.py -WIZVERSION = "1.0.2" # FAQ Wizard version +WIZVERSION = "1.0.3" # FAQ Wizard version # This parameter is normally overwritten with a dynamic value @@ -369,9 +369,13 @@ Click this button to commit your changes. <HR> """ -NOCOMMIT = """ -To commit your changes, please enter a log message, your name, email -addres, and the correct password in the form below. +NOCOMMIT_HEAD = """ +To commit your changes, please correct the following errors in the +form below and click the Preview Edit button. +<UL> +""" +NOCOMMIT_TAIL = """ +</UL> <HR> """ @@ -379,7 +383,7 @@ CANTCOMMIT_HEAD = """ Some required information is missing: <UL> """ -NEED_PASSWD = "<LI>You must provide the correct passwd.\n" +NEED_PASSWD = "<LI>You must provide the correct password.\n" NEED_AUTHOR = "<LI>You must enter your name.\n" NEED_EMAIL = "<LI>You must enter your email address.\n" NEED_LOG = "<LI>You must enter a log message.\n" diff --git a/Tools/faqwiz/faqwiz.py b/Tools/faqwiz/faqwiz.py index 2add159..6e45c6e 100644 --- a/Tools/faqwiz/faqwiz.py +++ b/Tools/faqwiz/faqwiz.py @@ -743,14 +743,20 @@ class FaqWizard: if commit_ok: emit(COMMIT) else: - emit(NOCOMMIT) + emit(NOCOMMIT_HEAD) + self.errordetail() + emit(NOCOMMIT_TAIL) emit(EDITFORM2, self.ui, entry, load_my_cookie()) emit(EDITFORM3) def cantcommit(self): self.prologue(T_CANTCOMMIT) print CANTCOMMIT_HEAD - if not self.ui.passwd: + self.errordetail() + print CANTCOMMIT_TAIL + + def errordetail(self): + if PASSWORD and self.ui.password != PASSWORD: emit(NEED_PASSWD) if not self.ui.log: emit(NEED_LOG) @@ -758,7 +764,6 @@ class FaqWizard: emit(NEED_AUTHOR) if not self.ui.email: emit(NEED_EMAIL) - print CANTCOMMIT_TAIL def commit(self, entry): file = entry.file |