--- loncom/interface/londocs.pm 2009/02/12 11:35:07 1.340 +++ loncom/interface/londocs.pm 2009/02/12 15:45:38 1.341 @@ -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 @@ HIDDENFORM } 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('

'.$error.'

'); +# } +# 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 $content='content'; 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('

'.$error.'

'); } + if ($hadchanges) { + &mark_hash_old(); + } + + &changewarning($r,''); $r->print(''); } if ($env{'form.pagepath'}) { @@ -3167,7 +3178,6 @@ $r->print(''); $active = 'style="display: block;"'; } $r->print('
'); - &changewarning($r); my $folder=$env{'form.folder'}; unless ($folder=~/^supplemental/) { $folder='supplemental';