Attachment 157479 Details for Bug 237356 – cvs commit log

cvs commit log

cvsattach (text/plain), 2.45 KB, created by Rich Megginson on 2007-06-20 16:29:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-06-20 16:29:34 UTC

Size: 2.45 KB

patch

obsolete

>Fix Description: Some minor cleanup:
>1) Fixed navigation.  Now you can go back through several dialogs.
>2) Need to create a new Inf even if no file given
>Platforms tested: RHEL4
>Flag Day: No.
>Doc impact: No.
>
>
>
>Index: Dialog.pm
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Dialog.pm,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -r1.3 -r1.4
>--- Dialog.pm	15 Jun 2007 22:11:15 -0000	1.3
>+++ Dialog.pm	20 Jun 2007 16:27:50 -0000	1.4
>@@ -136,6 +136,7 @@
> # you can set the 0 to a 1 if the user has chosen to use security
> sub run {
>     my $self = shift;
>+    my $direction = shift;
>     my $resp = $DialogManager::SAME;
> 
>     # display the dialog text
>@@ -181,6 +182,12 @@
>             }
>         } elsif ($resp == $DialogManager::ERR) {
>             last;
>+        } elsif (!$self->isDisplayed() && ($direction < 0) &&
>+                 ($resp == $DialogManager::NEXT)) {
>+            # we did not display this dialog, and the current navigation
>+            # direction is BACK, so we should return BACK, to allow
>+            # the user to go back through several dialogs
>+            $resp = $DialogManager::BACK;
>         }
>     }
> 
>
>
>Index: DialogManager.pm
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DialogManager.pm,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -r1.3 -r1.4
>--- DialogManager.pm	19 Jun 2007 18:24:57 -0000	1.3
>+++ DialogManager.pm	20 Jun 2007 16:27:50 -0000	1.4
>@@ -206,7 +206,7 @@
>         my $dialog = $self->{dialogs}->[$index];
>         if ($dialog->isEnabled()) {
>             my $resp = $NEXT;
>-            $resp = $dialog->run();
>+            $resp = $dialog->run($incr);
>             if ($resp == $BACK) {
>                 $incr = -1;
>             } elsif ($resp == $NEXT) {
>
>
>Index: Setup.pm.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Setup.pm.in,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -r1.6 -r1.7
>--- Setup.pm.in	20 Jun 2007 14:40:24 -0000	1.6
>+++ Setup.pm.in	20 Jun 2007 16:27:50 -0000	1.7
>@@ -135,6 +135,8 @@
>     # if user supplied inf file, use that to initialize
>     if (defined($self->{inffile})) {
>         $self->{inf} = new Inf($self->{inffile});
>+    } else {
>+        $self->{inf} = new Inf;
>     }
>     my $fh;
>     # create a temp inf file for writing for other processes

Actions: View

Attachments on bug 237356: 153230 | 153562 | 153667 | 153668 | 153674 | 153675 | 153677 | 153678 | 155103 | 155105 | 155406 | 155407 | 155408 | 155409 | 155410 | 155411 | 155412 | 155413 | 155414 | 155483 | 155484 | 155485 | 155486 | 155487 | 155488 | 155489 | 155490 | 156389 | 156510 | 156525 | 156539 | 156540 | 156541 | 156612 | 156613 | 156614 | 156626 | 156633 | 156634 | 156741 | 156829 | 156834 | 156839 | 156840 | 156895 | 157043 | 157044 | 157133 | 157159 | 157160 | 157164 | 157165 | 157167 | 157298 | 157378 | 157381 | 157388 | 157390 | 157400 | 157401 | 157407 | 157408 | 157429 | 157431 | 157469 | 157471 | 157479 | 157480 | 160762