[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm
bowersj2
lon-capa-cvs@mail.lon-capa.org
Thu, 25 Sep 2003 18:19:34 -0000
bowersj2 Thu Sep 25 14:19:34 2003 EDT
Modified files:
/loncom/interface lonprintout.pm
Log:
Oops, "any sequence" should not be available in construction space.
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.238 loncom/interface/lonprintout.pm:1.239
--- loncom/interface/lonprintout.pm:1.238 Thu Sep 25 14:16:04 2003
+++ loncom/interface/lonprintout.pm Thu Sep 25 14:19:34 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.238 2003/09/25 18:16:04 bowersj2 Exp $
+# $Id: lonprintout.pm,v 1.239 2003/09/25 18:19:34 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1148,9 +1148,6 @@
# "Remove all duplicate slashes."
$subdir =~ s|/+|/|g;
- # If it's a ~ directory, convert back to /home/user/public_html
- $subdir =~ s/^~(\w+)\//\/home\/$1\/public_html\//;
-
# What can be printed is a very dynamic decision based on
# lots of factors. So we need to dynamically build this list.
# To prevent security leaks, states are only added to the wizard
@@ -1286,9 +1283,10 @@
# Allow the user to select any sequence in the course, feed it to
# another resource selector for that sequence
- push @$printChoices, ["Resources from <b>selected sequence</b> in course",
- 'map_problems_pages', 'CHOOSE_SEQUENCE'];
- &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
+ if (!$helper->{VARS}->{'construction'}) {
+ push @$printChoices, ["Resources from <b>selected sequence</b> in course",
+ 'map_problems_pages', 'CHOOSE_SEQUENCE'];
+ &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
<state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">
<message>Select the sequence to print resources from:</message>
<resource variable="SEQUENCE">
@@ -1307,6 +1305,7 @@
</resource>
</state>
CHOOSE_FROM_ANY_SEQUENCE
+}
# Generate the first state, to select which resources get printed.
Apache::lonhelper::state->new("START", "Select Printing Options:");