[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm

[raeburn]

raeburn		Tue May 29 16:49:24 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmenu.pm 
  Log:
  - For 2.11.
  - Backport 1.380.  
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.11 loncom/interface/lonmenu.pm:1.369.2.12
--- loncom/interface/lonmenu.pm:1.369.2.11	Mon May 28 22:22:20 2012
+++ loncom/interface/lonmenu.pm	Tue May 29 16:49:23 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.11 2012/05/28 22:22:20 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.12 2012/05/29 16:49:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2024,9 +2024,10 @@
         ($env{'request.filename'}=~/$LONCAPA::assess_re/) &&
         ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
         my $duedate = &Apache::lonnet::EXT("resource.0.duedate");
-        if ($duedate && $duedate > time) {
+        my @interval=&Apache::lonnet::EXT("resource.0.interval");
+        if (($duedate && $duedate > time) ||
+            (!$duedate && @interval > 1)) {
             my ($collapse,$expand,$alttxt,$title,$currdisp);
-            my @interval=&Apache::lonnet::EXT("resource.0.interval");
             if (@interval > 1) {
                 $currdisp = 'inline';
                 $collapse = '► ';