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

[raeburn]

raeburn		Thu Dec 13 02:35:09 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	londocs.pm 
  Log:
  - For 2.11
    - Backport 1.503
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.13 loncom/interface/londocs.pm:1.484.2.14
--- loncom/interface/londocs.pm:1.484.2.13	Thu Dec 13 02:27:27 2012
+++ loncom/interface/londocs.pm	Thu Dec 13 02:35:08 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.13 2012/12/13 02:27:27 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.14 2012/12/13 02:35:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2467,13 +2467,14 @@
             </form>
 EXTLNK
         } else {
-            my ($cfile,$home,$switchserver,$uploaded) =
-                &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom);
+            my ($cfile,$home,$switchserver,$forceedit,$forceview) =
+                &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
             if (($cfile ne '') && ($symb ne '')) {
                 my $jscall =
                     &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
                                                             $switchserver,
-                                                            $uploaded,$symb);
+                                                            $forceedit,
+                                                            undef,$symb);
                 if ($jscall) {
                     $editlink = ' <a class="LC_docs_ext_edit" href="javascript:'.
                                 $jscall.'" >'.&mt('Edit').'</a>';
@@ -4782,6 +4783,7 @@
 	currentData.style.display = 'block';
         activeTab = pageId;
         toggleUpload();
+        toggleMap();
         if (nav == 'mainnav') {
             var storedpath = "$docs_folderpath";
             if (storedpath == '') {