[LON-CAPA-cvs] cvs: loncom /auth roles.tab rolesplain.tab /homework bridgetask.pm

[albertel]

albertel		Mon Aug 15 15:36:23 2005 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm 
    /loncom/auth	roles.tab rolesplain.tab 
  Log:
  - add permission for bridgetask queue viewing
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.39 loncom/homework/bridgetask.pm:1.40
--- loncom/homework/bridgetask.pm:1.39	Tue Aug  9 12:48:15 2005
+++ loncom/homework/bridgetask.pm	Mon Aug 15 15:36:21 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.39 2005/08/09 16:48:15 albertel Exp $
+# $Id: bridgetask.pm,v 1.40 2005/08/15 19:36:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -147,8 +147,8 @@
     my $result=' <input type="submit" name="gradeasubmission" value="'.
 	&mt("Get a submission to grade").'" />';
     $result.='<input type="hidden" name="grade_target" value="webgrade" />';
-    if ( 1) {
-	#need a permissions for limitng this to 'powerful users'
+    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
+	# FIXME need a permission for limiting this to 'powerful users'
 
 	my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
 	$result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
@@ -225,13 +225,14 @@
 	    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
 	    $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
 	    my $symb=&Apache::lonnet::symbread();
-	    $body_tag_start.='<form method="POST" action="/adm/slotrequest">'.
-		'<input type="hidden" name="symb" value="'.$symb.'" />'.
-		'<input type="hidden" name="command" value="showslots" />'.
-		'<input type="submit" name="requestattempt" value="'.
-		&mt('Show Slot list').'" />'.
-		'</form>';
-
+	    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
+		$body_tag_start.='<form method="POST" action="/adm/slotrequest">'.
+		    '<input type="hidden" name="symb" value="'.$symb.'" />'.
+		    '<input type="hidden" name="command" value="showslots" />'.
+		    '<input type="submit" name="requestattempt" value="'.
+		    &mt('Show Slot list').'" />'.
+		    '</form>';
+	    }
 	}
     }
     if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
@@ -285,7 +286,7 @@
 	    } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
 		if ($status eq 'NEEDS_CHECKIN') {
 		    if (&proctor_check_auth($slot_name,$slot)) {
-			#FIXME immeadiatly add this to the grading queue
+			# FIXME immeadiatly add this to the grading queue
                         #      with slot->{'endtime'} for when grading can 
                         #      begin on this resource
 			# FIXME I think the above is done by default,
@@ -539,7 +540,6 @@
 		}
 	    } elsif ($ungraded) {
 		$Apache::lonhomework::results{"resource.$version.status"}='ungraded';
-		# FIXME if in review queue need to move back to grading queue
 		if ($env{'form.queue'} eq 'reviewqueue') {
 		    &Apache::lonxml::debug("moving back.");
 		    &move_between_queues('reviewqueue','gradingqueue');
Index: loncom/auth/roles.tab
diff -u loncom/auth/roles.tab:1.38 loncom/auth/roles.tab:1.39
--- loncom/auth/roles.tab:1.38	Fri Jul  8 06:39:49 2005
+++ loncom/auth/roles.tab	Mon Aug 15 15:36:21 2005
@@ -2,9 +2,9 @@
 dc:s bre:sma:adv:mcr
 dc:d cli&UIK:cau&UIK:cca&UIK:caa&UIK:cdg&UIK:mau:ccc&U:cin&UIK:cta&UIK:cep&UIK:ccr&UIK:cst&UIK:cad&UIK:csc&UIK:dro:mky:psa:usc
 cc:s bre:sma:mcr:vsa:adv:vcl
-cc:c cin&IK:cta&IK:cep&IK:ccr&IK:cst&IK:are:cre:ere:vgr:gan:srm:opa:mgr:rin:pch:plc:mdc:usc:vsa:vcl
+cc:c cin&IK:cta&IK:cep&IK:ccr&IK:cst&IK:are:cre:ere:vgr:gan:srm:opa:mgr:mgq:rin:pch:plc:mdc:usc:vsa:vcl
 in:s sma:vgr:mgr:adv:vcl
-in:c vgr:mgr:gan:dcm:srm:pch&C:plc&C:dch:pac:rin:las:opa:bre:vcl
+in:c vgr:mgr:mgq:gan:dcm:srm:pch&C:plc&C:dch:pac:rin:las:opa:bre:vcl
 ta:d sma
 ta:c bre&RL:vgr&CR:mgr&CR:srm:pch&C:plc&C:dch:pac
 ep:s adv
@@ -12,7 +12,7 @@
 ep:c bre&R:mgr&R:dcm:las
 cr:s adv&SR
 cr:d sma
-cr:c bre&R:vgr&SCR:mgr&SCR:gan&SCR:dcm&SC:srm&SC:pch:plc:dch&S:pac:rin&S:las&SR:opa&SR:mdc&SR:cst&IK
+cr:c bre&R:vgr&SCR:mgr&SCR:mgq&SCR:gan&SCR:dcm&SC:srm&SC:pch:plc:dch&S:pac:rin&S:las&SR:opa&SR:mdc&SR:cst&IK
 st:d sma&L
 st:c bre&RXL:pch&CL:plc&CL:pac&CL
 ad:s adv
Index: loncom/auth/rolesplain.tab
diff -u loncom/auth/rolesplain.tab:1.15 loncom/auth/rolesplain.tab:1.16
--- loncom/auth/rolesplain.tab:1.15	Sat Jun 18 20:41:32 2005
+++ loncom/auth/rolesplain.tab	Mon Aug 15 15:36:21 2005
@@ -54,6 +54,7 @@
 vsa:View student activity
 vcl:View class list
 mgr:Modify grades
+mgq:Modify grade queue
 gan:Generate anonymous statistics
 dcm:Disable all communication among students
 sma:Send internal email