[BACK]Return to londocs.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.630 and 1.632

version 1.630, 2017/05/10 23:34:15 version 1.632, 2017/05/19 18:24:03
Line 1672  sub do_paste_from_buffer { Line 1672  sub do_paste_from_buffer {
             $srcdom{$suffix} = $srcd;              $srcdom{$suffix} = $srcd;
             $srcnum{$suffix} = $srcn;              $srcnum{$suffix} = $srcn;
         } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) ||          } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) ||
                  ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg|ext\.tool)$})) {                   ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$}) ||
             my $srctype= $1;                   ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) {
             my ($srcd,$srcn) = split(/_/,$cid);              my ($srcd,$srcn) = split(/_/,$cid);
 # When paste buffer was populated using an active role in a different course  # When paste buffer was populated using an active role in a different course
 # check for mdc privilege in the course from which the resource was pasted  # check for mdc privilege in the course from which the resource was pasted
Line 1683  sub do_paste_from_buffer { Line 1683  sub do_paste_from_buffer {
                     next;                      next;
                 }                  }
             }              }
             if (($srctype eq 'ext.tool') && ($srcd ne $coursedom)) {  # When buffer was populated using an active role in a different course
   # disallow pasting of External Tool if course is in a different domain.
               if (($url =~ m{/ext\.tool$}) && ($srcd ne $coursedom)) {
                 $notindom{$suffix} = 1;                  $notindom{$suffix} = 1;
                 next;                  next;
             }              }
Line 2164  sub dbcopy { Line 2166  sub dbcopy {
                 if (!$suffix) {                  if (!$suffix) {
                     if ($prefix eq 'smppg') {                      if ($prefix eq 'smppg') {
                         $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url);                          $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url);
                       } elsif ($prefix eq 'exttool') {
                           $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying an external tool [_1].',$url);
                     } else {                      } else {
                         $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url);                          $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url);
                     }                      }
Line 4326  $form_end; Line 4330  $form_end;
            $line.=&Apache::loncommon::modal_link($link,$title,600,500);             $line.=&Apache::loncommon::modal_link($link,$title,600,500);
        }         }
     } elsif (($hiddenfolder) || ($hiddenres)) {      } elsif (($hiddenfolder) || ($hiddenres)) {
        $line.=$title.' <span class="LC_warning LC_docs_reinit_warn">'.&mt('(Hidden)').'</span>';         $line.=$title.' <span class="LC_warning LC_docs_reinit_warn">('.&mt('Hidden').')</span>';
     } else {      } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';         $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }      }
Line 6052  NWEBFORM Line 6056  NWEBFORM
                 $numauthor ++;                  $numauthor ++;
             }              }
         }          }
         my ($pickdir,$showtitle);;          my ($pickdir,$showtitle);
         if ($numauthor) {          if ($numauthor) {
             my @order;              my @order;
             my $defrole;              my $defrole;
Removed from v.1.630  
changed lines
  Added in v.1.632

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>