--- loncom/interface/londocs.pm 2016/03/18 21:59:42 1.599 +++ loncom/interface/londocs.pm 2016/04/02 04:30:20 1.601 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.599 2016/03/18 21:59:42 damieng Exp $ +# $Id: londocs.pm,v 1.601 2016/04/02 04:30:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3429,7 +3429,9 @@ sub process_file_upload { } my $quotatype = 'unofficial'; if ($crstype eq 'Community') { - $quotatype = 'community'; + $quotatype = 'community'; + } elsif ($crstype eq 'Placement') { + $quotatype = 'placement'; } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { $quotatype = 'official'; } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { @@ -4990,8 +4992,9 @@ sub handler { } my $tabidstr = join("','",@tabids); %ltitools = &Apache::lonnet::get_domain_ltitools($coursedom); + my $posslti = keys(%ltitools); my $exttoolurl = "/adm/$coursedom/$coursenum/new/exttool"; - $script .= &editing_js($udom,$uname,$supplementalflag). + $script .= &editing_js($udom,$uname,$supplementalflag,$posslti). &history_tab_js(). &inject_data_js(). &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid). @@ -5150,7 +5153,9 @@ sub handler { # file size to determine if upload should be allowed. my $quotatype = 'unofficial'; if ($crstype eq 'Community') { - $quotatype = 'community'; + $quotatype = 'community'; + } elsif ($crstype eq 'Placement') { + $quotatype = 'placement'; } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { $quotatype = 'official'; } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { @@ -6087,7 +6092,7 @@ END } sub editing_js { - my ($udom,$uname,$supplementalflag) = @_; + my ($udom,$uname,$supplementalflag,$posslti) = @_; my %js_lt = &Apache::lonlocal::texthash( p_mnf => 'Name of New Folder', t_mnf => 'New Folder', @@ -6161,12 +6166,18 @@ sub editing_js { $backtourl = '/adm/navmaps'; } - my $fieldsets = "'ext','tool','doc'"; + my $fieldsets = "'ext','doc'"; + if ($posslti) { + $fieldsets .= ",'tool'"; + } unless ($main_container_page) { $fieldsets .=",'ims'"; } if ($supplementalflag) { - $fieldsets = "'suppext','supptool','suppdoc'"; + $fieldsets = "'suppext','suppdoc'"; + if ($posslti) { + $fieldsets .= ",'supptool'"; + } } return <