[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm

[raeburn]

raeburn		Wed Sep  4 20:49:39 2024 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
  Log:
  - Announcements on roles/courses page only available for course roles.
  - Need to pass current time to locallocaltime() for use in message
    confirming registration for course with access key control.
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.372 loncom/auth/lonroles.pm:1.373
--- loncom/auth/lonroles.pm:1.372	Fri Nov 17 17:02:21 2023
+++ loncom/auth/lonroles.pm	Wed Sep  4 20:49:39 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.372 2023/11/17 17:02:21 raeburn Exp $
+# $Id: lonroles.pm,v 1.373 2024/09/04 20:49:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -703,7 +703,7 @@
 						     $env{'user.name'},
                                                      &mt('Assigned from [_1] at [_2] for [_3]'
                                                         ,$ip
-                                                        ,&Apache::lonlocal::locallocaltime()
+                                                        ,&Apache::lonlocal::locallocaltime($now)
                                                         ,$trolecode)
                                                      );
 				 unless ($assignresult eq 'ok') {
@@ -2245,7 +2245,7 @@
                         $trolecode."','".$buttonname.'\');" /></td>';
         }
     }
-    if (($trolecode !~ m/^(dc|ca|au|aa)\./)  && (!$skipcal)) {
+    if (($trolecode !~ m/^(ca|aa)\./) && ($trest ne '') && (!$skipcal)) {
 	$tremark.=&Apache::lonannounce::showday(time,1,
 			 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
     }