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

[raeburn]

raeburn		Tue Nov 13 22:49:15 2012 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
  Log:
  - Don't show alert: "WARNING: Removing a resource makes associated grades and scores inaccessible!" for External Resource.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.504 loncom/interface/londocs.pm:1.505
--- loncom/interface/londocs.pm:1.504	Sun Nov 11 17:37:17 2012
+++ loncom/interface/londocs.pm	Tue Nov 13 22:49:15 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.504 2012/11/11 17:37:17 raeburn Exp $
+# $Id: londocs.pm,v 1.505 2012/11/13 22:49:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2163,9 +2163,13 @@
         $esc_path=&escape($env{'form.pagepath'});
 	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
     }
+    my $isexternal;
     if (!$supplementalflag && $residx) {
         my $currurl = $url;
         $currurl =~ s{^http(|s)(:|:)//}{/adm/wrapper/ext/};
+        if ($currurl =~ m{^/adm/wrapper/ext/}) {
+            $isexternal = 1;
+        }
         my $path = 'uploaded/'.
                    $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
                    $env{'course.'.$env{'request.course.id'}.'.num'}.'/';
@@ -2281,8 +2285,8 @@
 			    |/aboutme$
 			    |/navmaps$
 			    |/bulletinboard$
-			    |\.html$
-			    |^/adm/wrapper/ext)}x)) {
+			    |\.html$)}x)
+             || $isexternal) {
 	    $skip_confirm = 1;
 	}