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

raeburn lon-capa-cvs@mail.lon-capa.org
Mon, 13 Dec 2004 01:57:10 -0000


raeburn		Sun Dec 12 20:57:10 2004 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
  Log:
  Suppress display of Supplemental Course Documents table when editing a sequence or page imported into DOCS from an IMS package.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.154 loncom/interface/londocs.pm:1.155
--- loncom/interface/londocs.pm:1.154	Sun Dec 12 14:54:56 2004
+++ loncom/interface/londocs.pm	Sun Dec 12 20:57:10 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.154 2004/12/12 19:54:56 albertel Exp $
+# $Id: londocs.pm,v 1.155 2004/12/13 01:57:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1681,7 +1681,7 @@
 # is this a standard course?
 
     my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//);
-    my $forcestandard;
+    my $forcestandard = 0;
     my $forcesupplement;
     my $script='';
     my $allowed;
@@ -1707,7 +1707,10 @@
        $showdoc='/'.$1;
     }
     unless ($showdoc) { # got called from remote
-       $forcestandard=($ENV{'form.folder'}=~/^default_/);
+       if (($ENV{'form.folder'}=~/^default_$/) || 
+          ($ENV{'form.folder'} =~ m#^\d+/(pages|sequences)/#)) {
+           $forcestandard = 1;
+       } 
        $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
 
 # does this user have privileges to post, etc?