-
-
-
END
}
@@ -855,7 +851,7 @@ sub isMetaSame {
sub getStatus {
my ($resdir, $targetdir, $cstr_dir, $filename,
- $linkfilename, $cmtime, $meta_same) = @_;
+ $linkfilename, $crsauthor, $cmtime, $meta_same) = @_;
my $pubstatus = 'unpublished';
my $status = &mt('Unpublished');
@@ -881,7 +877,9 @@ sub getStatus {
);
$rights_status .=
$lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)};
-
+ if (($crsauthor) && ($filename =~ /\.rights$/)) {
+ $rights_status =~ s/,\s+$//;
+ }
if ($same) {
if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
$pubstatus = 'obsolete';
@@ -899,17 +897,21 @@ sub getStatus {
$pubstatus = 'modified';
$status=&mt('Modified').
'
'. $rights_status;
- if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
- $status.='
'.
- &Apache::loncommon::modal_link(
- '/adm/diff?filename='.$linkfilename.'&versiontwo=priv',
- &mt('Diffs'),600,500);
+ unless (($crsauthor) && ($filename =~ /\.rights$/)) {
+ if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
+ $status.='
'.
+ &Apache::loncommon::modal_link(
+ '/adm/diff?filename='.$linkfilename.'&versiontwo=priv',
+ &mt('Diffs'),600,500);
+ }
}
- }
+ }
- $status.="\n".'
'.
- &Apache::loncommon::modal_link(
- '/adm/retrieve?filename='.$linkfilename.'&inhibitmenu=yes&add_modal=yes',&mt('Retrieve'),600,500);
+ unless (($crsauthor) && ($filename =~ /\.rights$/)) {
+ $status.="\n".'
'.
+ &Apache::loncommon::modal_link(
+ '/adm/retrieve?filename='.$linkfilename.'&inhibitmenu=yes&add_modal=yes',&mt('Retrieve'),600,500);
+ }
}
return ($status, $pubstatus);
@@ -920,9 +922,9 @@ sub getStatus {
# Put a table row for a file resource.
#
sub putresource {
- my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir,
- $linkdir, $cmtime, $size, $numres, $linkfilename, $title,
- $status, $pubstatus) = @_;
+ my ($r, $udom, $uname, $filename, $thisdisfn, $resdir,
+ $targetdir, $linkdir, $crsauthor, $cmtime, $size,
+ $numres, $linkfilename, $title, $status, $pubstatus) = @_;
&Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
my $editlink='';
@@ -948,7 +950,9 @@ sub putresource {
}
my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish');
my $pub_select = '';
- &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
+ unless (($crsauthor) && ($filename=~ /\.rights$/)) {
+ &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
+ }
$r->print(&Apache::loncommon::start_data_table_row().
''.($filename=~/[\#\~]$/?' ':
' ').' | '.