[LON-CAPA-cvs] cvs: loncom /interface loncoursequeueadmin.pm

[raeburn]

raeburn		Tue Mar 30 16:02:27 2010 EDT

  Modified files:              
    /loncom/interface	loncoursequeueadmin.pm 
  Log:
  - Correction to args in call to lonnet::dump_dom() in &process_official_reqs().
  - Convert "Validate" button from button with onclick call to javascript
    to submit button.
  - Next phase varies on context ("approval" versus "pending").  
  
  
Index: loncom/interface/loncoursequeueadmin.pm
diff -u loncom/interface/loncoursequeueadmin.pm:1.23 loncom/interface/loncoursequeueadmin.pm:1.24
--- loncom/interface/loncoursequeueadmin.pm:1.23	Tue Mar 30 15:23:51 2010
+++ loncom/interface/loncoursequeueadmin.pm	Tue Mar 30 16:02:27 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Utilities to administer domain course requests and course self-enroll requests
 #
-# $Id: loncoursequeueadmin.pm,v 1.23 2010/03/30 15:23:51 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.24 2010/03/30 16:02:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -260,11 +260,13 @@
         $formaction = '/adm/createcourse';
         $namespace = 'courserequestqueue';
         my $disposition = 'approval';
+        my $nextphase = 'requestchange';
         if ($context eq 'pending') {
             $disposition = 'pending';
+            $nextphase = 'requestvalidation';
         }
         %requesthash = &Apache::lonnet::dump_dom($namespace,$dom,'_'.$disposition);
-        $nextelement = '<input type="hidden" name="phase" value="requestchange" />';
+        $nextelement = '<input type="hidden" name="phase" value="'.$nextphase.'" />';
     }
     my ($output,%queue_by_date);
     if (keys(%requesthash) > 0) {
@@ -322,8 +324,8 @@
             $output .= '</div>'; 
         }
         if ($context eq 'pending') {
-            $output .= '<br /><input type="button" name="validationcheck" value="'.
-                       &mt('Validate').'" onclick="javascript:runValidation();" /><br />'."\n".
+            $output .= '<br /><input type="submit" name="validationcheck" value="'.
+                       &mt('Validate').'" /><br />'."\n".
                        '<p>'.&mt('Any course/community requests which are successfully validated will be created immediately.').' '.&mt('Unvalidated requests will be listed for manual approval/rejection.').'</p>';
         } else {
             $output .= '<br /><input type="submit" name="processqueue" value="'.&mt('Save').'" />';
@@ -1320,7 +1322,7 @@
     my ($context,$dom) = @_;
     my $reqsnamespace = 'courserequestqueue';
     my %requesthash =
-        &Apache::lonnet::dump_dom($reqsnamespace,$dom,undef,'_pending');
+        &Apache::lonnet::dump_dom($reqsnamespace,$dom,'_pending');
     my (%newcids,%longroles,%stillpending);
     my @courseroles = ('cc','in','ta','ep','ad','st');
     foreach my $role (@courseroles) {