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

www lon-capa-cvs@mail.lon-capa.org
Wed, 13 Jul 2005 22:09:11 -0000


www		Wed Jul 13 18:09:11 2005 EDT

  Modified files:              
    /loncom/interface	lonmeta.pm 
  Log:
  More predictable action after deleting or clearing bombs (avoid being
  bounced to meta screen)
  
  
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.98 loncom/interface/lonmeta.pm:1.99
--- loncom/interface/lonmeta.pm:1.98	Fri Jul  8 06:39:49 2005
+++ loncom/interface/lonmeta.pm	Wed Jul 13 18:09:11 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.98 2005/07/08 10:39:49 www Exp $
+# $Id: lonmeta.pm,v 1.99 2005/07/13 22:09:11 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -903,9 +903,11 @@
     $target=~s/\.meta$//;
     my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
     if ($bombs) {
+        my $showdel=1;
         if ($env{'form.delmsg'}) {
             if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') {
                 $bombs=&mt('Messages deleted.');
+		$showdel=0;
             } else {
                 $bombs=&mt('Error deleting messages');
             }
@@ -915,19 +917,27 @@
 	    $cleardir=~s/\/[^\/]+$/\//;
             if (&Apache::lonmsg::clear_author_res_msg($cleardir) eq 'ok') {
                 $bombs=&mt('Messages cleared.');
+		$showdel=0;
             } else {
                 $bombs=&mt('Error clearing messages');
             }
         }
         my $del=&mt('Delete Messages for this Resource');
 	my $clear=&mt('Clear all Messages in Subdirectory');
+	my $goback=&mt('Back to Source File');
         $r->print(<<ENDBOMBS);
 <h1>$disuri</h1>
 <form method="post" name="defaultmeta">
+ENDBOMBS
+        if ($showdel) {
+	    $r->print(<<ENDDEL);
 <input type="submit" name="delmsg" value="$del" />
 <input type="submit" name="clearmsg" value="$clear" />
-<br />$bombs
-ENDBOMBS
+ENDDEL
+        } else {
+            $r->print('<a href="'.$disuri.'" />'.$goback.'</a>');
+	}
+	$r->print('<br />'.$bombs);
     } else {
         my $displayfile='Catalog Information for '.$disuri;
         if ($disuri=~/\/default$/) {