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

[raeburn]

raeburn		Thu Mar 26 14:16:11 2015 EDT

  Modified files:              
    /loncom/interface	lonrequestcourse.pm loncoursequeueadmin.pm 
  Log:
  - If cloning, include courseID of course being cloned in information sent
    sent to localenroll::validate_crsreq() and locallenroll::crsreq_updates()
    (key is _LC_clonefrom) in $custominfo and $incoming hashrefs respectively.  
  
  
Index: loncom/interface/lonrequestcourse.pm
diff -u loncom/interface/lonrequestcourse.pm:1.85 loncom/interface/lonrequestcourse.pm:1.86
--- loncom/interface/lonrequestcourse.pm:1.85	Mon Jun 16 01:42:22 2014
+++ loncom/interface/lonrequestcourse.pm	Thu Mar 26 14:16:11 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.85 2014/06/16 01:42:22 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.86 2015/03/26 14:16:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3670,6 +3670,11 @@
                                             $dom,$crstype,$limit,\$message);
         } elsif ($val eq 'validate') {
             my ($inststatuslist,$validationchk,$validation,%custominfo);
+            if (ref($details) eq 'HASH') {
+                if ($details->{'clonecrs'}) {
+                    $custominfo{'_LC_clonefrom'} = $details->{'clonedom'}.'_'.$details->{'clonecrs'};
+                }
+            }
             if (@inststatuses > 0) {
                 $inststatuslist = join(',', at inststatuses);
             }
@@ -3762,6 +3767,11 @@
                       &mt('Your request is being processed; this page will update when processing is complete.').
                       '</div>');
             $r->rflush();
+            if (ref($details) eq 'HASH') {
+                if ($details->{'clonecrs'}) {
+                    $customitems{'_LC_clonefrom'} = $details->{'clonedom'}.'_'.$details->{'clonecrs'};
+                }
+            }
             my ($result,$postprocess) = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
                                           'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
                                           \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,
Index: loncom/interface/loncoursequeueadmin.pm
diff -u loncom/interface/loncoursequeueadmin.pm:1.49 loncom/interface/loncoursequeueadmin.pm:1.50
--- loncom/interface/loncoursequeueadmin.pm:1.49	Tue May 13 16:05:45 2014
+++ loncom/interface/loncoursequeueadmin.pm	Thu Mar 26 14:16:11 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Utilities to administer domain course requests and course self-enroll requests
 #
-# $Id: loncoursequeueadmin.pm,v 1.49 2014/05/13 16:05:45 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.50 2015/03/26 14:16:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -968,6 +968,9 @@
                                     }
                                 }
                             }
+                            if ($history{'details'}{'clonecrs'}) {
+                                $customitems{'_LC_clonefrom'} = $history{'details'}{'clonedom'}.'_'.$history{'details'}{'clonecrs'};
+                            }
                             my ($result,$postprocess) = &course_creation($cdom,$cnum,$context,$history{'details'},\$logmsg,
                                                         \$newusermsg,\$addresult,\$enrollcount,
                                                         \$response,\$keysmsg,\%domdefs,$longroles,\$code,\%customitems);
@@ -2026,6 +2029,9 @@
                             }
                         }
                     }
+                    if ($history{'details'}{'clonecrs'}) {
+                        $customitems{'_LC_clonefrom'} = $history{'details'}{'clonedom'}.'_'.$history{'details'}{'clonecrs'};
+                    }
                     my ($result,$postprocess) = 
                         &course_creation($dom,$cnum,'domain',$history{'details'},\$logmsg,\$newusermsg,\$addresult,
                                          \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,\$code,\%customitems);