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

[ehlerst]

ehlerst		Thu Feb 12 15:45:38 2009 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
  Log:
  fixed missing re-initialize button problem.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.340 loncom/interface/londocs.pm:1.341
--- loncom/interface/londocs.pm:1.340	Thu Feb 12 11:35:07 2009
+++ loncom/interface/londocs.pm	Thu Feb 12 15:45:38 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.340 2009/02/12 11:35:07 raeburn Exp $
+# $Id: londocs.pm,v 1.341 2009/02/12 15:45:38 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2929,11 +2929,16 @@
        } else {
            #$postexec='self.close();';
        }
-       $hadchanges=0;
-       if ($hadchanges) {
-	   &mark_hash_old();
-       }
-       &changewarning($r,$postexec);
+#       $hadchanges=0;
+#	my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+#       if ($error) {
+#           $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+#       }
+#       if ($hadchanges) {
+#	   &mark_hash_old();
+#       }
+#
+#       &changewarning($r,$postexec);
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
        my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
@@ -3151,10 +3156,16 @@
 my $navigation='navigation';
 my $varcd = 'Main Course Documents';
 $r->print(&generate_edit_table($tid,$content,$navigation,$varcd,\%namehash,\%orderhash)); 
-my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+ $hadchanges=0;
+        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
        if ($error) {
            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }
+       if ($hadchanges) {
+           &mark_hash_old();
+       }
+
+       &changewarning($r,'');
 $r->print('</div>');
       }
        if ($env{'form.pagepath'}) {
@@ -3167,7 +3178,6 @@
           $active = 'style="display: block;"';
        }
        $r->print('<div class="LC_ContentBox" id="Supplemental Course Documents" '.$active.'>');
-	&changewarning($r);
        my $folder=$env{'form.folder'};
        unless ($folder=~/^supplemental/) {
 	   $folder='supplemental';