[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

[foxr]

foxr		Wed Mar 29 06:47:05 2006 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Defect 4374  - Make subsequences show up as folders in resource selection
       when selecting an outer sequence.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.433 loncom/interface/lonprintout.pm:1.434
--- loncom/interface/lonprintout.pm:1.433	Thu Mar 23 17:32:10 2006
+++ loncom/interface/lonprintout.pm	Wed Mar 29 06:47:03 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.433 2006/03/23 22:32:10 albertel Exp $
+# $Id: lonprintout.pm,v 1.434 2006/03/29 11:47:03 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2150,10 +2150,11 @@
         my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
     <message>(mark them then click "next" button) <br /></message>
-    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
+    <resource variable="RESOURCES" multichoice="1" toponly='0' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
-      <filterfunc>return $isProblem;</filterfunc>
+      <filterfunc>return $isProblemOrMap;</filterfunc>
+      <choicefunc>return $isNotMap;</choicefunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
       <option text='Newpage' variable='FINISHPAGE' />
@@ -2162,10 +2163,10 @@
 
   <state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
     <message>(mark them then click "next" button) <br /></message>
-    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
+    <resource variable="RESOURCES" multichoice="1" toponly='0' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
-      <filterfunc>return $isNotMap;</filterfunc>
+      <choicefunc>return $isNotMap;</choicefunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
       <option text='Newpage' variable='FINISHPAGE' />
@@ -2535,10 +2536,11 @@
     </state>
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
     <message>(mark desired resources then click "next" button) <br /></message>
-    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
+    <resource variable="RESOURCES" multichoice="1" toponly='0' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
-      <filterfunc>return $isProblem</filterfunc>
+      <filterfunc>return $isProblemOrMap;</filterfunc>
+      <choicefunc>return $isProblem;</choicefunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
       <option text='Newpage' variable='FINISHPAGE' />