[LON-CAPA-cvs] cvs: rat / lonpageflip.pm loncom/interface lonnavdisplay.pm

[raeburn]

raeburn		Fri Feb  7 20:46:01 2025 EDT

  Modified files:              
    /loncom/interface	lonnavdisplay.pm 
    /rat	lonpageflip.pm 
  Log:
  - Possible values of first item returned byloncommon::needs_coursereinit()
    changed in loncommon.pm rev. 1.1391.
  
  
Index: loncom/interface/lonnavdisplay.pm
diff -u loncom/interface/lonnavdisplay.pm:1.44 loncom/interface/lonnavdisplay.pm:1.45
--- loncom/interface/lonnavdisplay.pm:1.44	Mon Oct 14 01:34:57 2024
+++ loncom/interface/lonnavdisplay.pm	Fri Feb  7 20:46:01 2025
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.44 2024/10/14 01:34:57 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.45 2025/02/07 20:46:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -129,7 +129,7 @@
     my $course_type = &Apache::loncommon::course_type();
     if (($course_type eq 'Placement') && (!$env{'request.role.adv'})) { 
         my $furl = &Apache::lonpageflip::first_accessible_resource();
-        if ($result eq 'update') {
+        if (($result eq 'main') || ($result eq 'both')) {
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             $r->print($closure.&Apache::loncommon::end_page());
             return OK;
@@ -160,7 +160,7 @@
     my $navmap = Apache::lonnavmaps::navmap->new();
 
     if (!defined($navmap)) {
-        if ($result eq 'update') {
+        if (($result eq 'main') || ($result eq 'both')) {
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             $r->print($closure.&Apache::loncommon::end_page());
         }
@@ -170,7 +170,7 @@
         return HTTP_NOT_ACCEPTABLE;
     }
 
-    if ($result eq 'update') {
+    if (($result eq 'main') || ($result eq 'both')) {
         $r->rflush();
         &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
         $r->print($closure);
@@ -183,7 +183,7 @@
     }
 
     &startContentScreen($r,'navmaps',$course_type);
-    unless ($result eq 'update') {
+    unless (($result eq 'main') || ($result eq 'both')) {
         $r->rflush();
     }
 
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.114 rat/lonpageflip.pm:1.115
--- rat/lonpageflip.pm:1.114	Sat Oct 29 18:13:29 2022
+++ rat/lonpageflip.pm	Fri Feb  7 20:46:01 2025
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.114 2022/10/29 18:13:29 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.115 2025/02/07 20:46:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -563,7 +563,7 @@
           } else {
               $furl=&Apache::lonnet::absolute_url().$furl;
           }
-          if ($reinitcheck eq 'update') {
+          if (($reinitcheck eq 'main') || ($reinitcheck eq 'both')) {
               &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
               $r->print(&reinited_js($furl,$env{'request.course.id'},100));
               $r->print(&Apache::loncommon::end_page());
@@ -605,7 +605,7 @@
          } else {
              $newloc=&Apache::lonnet::absolute_url().$newloc
          }
-         if ($reinitcheck eq 'update') {
+         if (($reinitcheck eq 'main') || ($reinitcheck eq 'both')) {
              $r->print(&reinited_js($newloc,$env{'request.course.id'},100));
              $r->print(&Apache::loncommon::end_page());
              return OK;
@@ -632,7 +632,7 @@
 	 } else {
              my $newloc = &Apache::lonnet::absolute_url().
                           '/adm/navmaps'; 
-             if ($reinitcheck eq 'update') {
+             if (($reinitcheck eq 'main') || ($reinitcheck eq 'both')) {
                  &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
                  $r->print(&reinited_js($newloc,$env{'request.course.id'},100));
                  $r->print(&Apache::loncommon::end_page());
@@ -747,7 +747,7 @@
                           $url .= $anchor;
                       }
                   }
-                  if ($reinitcheck eq 'update') {
+                  if (($reinitcheck eq 'main') || ($reinitcheck eq 'both')) {
                       &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
                       $r->print(&reinited_js($url,$env{'request.course.id'},100)); 
                       $r->print(&Apache::loncommon::end_page());
@@ -876,7 +876,7 @@
 	      }
 	  } else {
 # ------------------------------------------------- Problem, could not tie hash
-              if ($reinitcheck eq 'update') {
+              if (($reinitcheck eq 'main') || ($reinitcheck eq 'both')) {
                   &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
                   $r->print(&Apache::loncommon::end_page());
               } 
@@ -886,7 +886,7 @@
       } else {
 # ---------------------------------------- No, could not determine where we are
           my $newloc = '/adm/ambiguous';
-          if ($reinitcheck eq 'update') {
+          if (($reinitcheck eq 'main') || ($reinitcheck eq 'both')) {
               &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
               $r->print(&reinited_js($newloc,$env{'request.course.id'},100));
               $r->print(&Apache::loncommon::end_page());