--- loncom/interface/lonrequestcourse.pm 2010/01/14 20:08:13 1.43
+++ loncom/interface/lonrequestcourse.pm 2010/02/25 08:18:32 1.45
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.43 2010/01/14 20:08:13 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.45 2010/02/25 08:18:32 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -176,7 +176,6 @@ sub handler {
&get_breadcrumbs($dom,$action,\$state,\%states,\%trail);
if ($action eq 'display') {
if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
- my $namespace = 'courserequestqueue';
if ($env{'form.cnum'} ne '') {
my $cnum = $env{'form.cnum'};
my $reqkey = $cnum.'_approval';
@@ -275,6 +274,9 @@ sub handler {
$jscript = &mainmenu_javascript();
} else {
$jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
+ if ($state eq 'courseinfo') {
+ $jscript .= &cloning_javascript();
+ }
}
}
@@ -354,6 +356,22 @@ function setAction(courseForm) {
END
}
+sub cloning_javascript {
+ return <<"END";
+function setCloneDisplay(courseForm) {
+ if (courseForm.cloning.length > 1) {
+ for (var i=0; i '.&mt('Your community request has been updated').''.&mt('Clone From').' ';
- if (($env{'form.clonecrs'} =~ /^$match_name$/) &&
+ if (($env{'form.cloning'}) &&
+ ($env{'form.clonecrs'} =~ /^$match_name$/) &&
($env{'form.clonedom'} =~ /^$match_domain$/)) {
my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
$env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'},
@@ -2351,6 +2374,24 @@ function validateForm() {
}
nextPage(document.$formname,'$next');
}
+
+function toggleCloning() {
+ var willclone;
+ if (document.$formname.cloning.length > 1) {
+ for (var i=0; i'.&Apache::loncommon::help_open_topic('Course_Request_Description').' '.$title.'
'.
&Apache::lonhtmlcommon::row_closure(1).
@@ -2377,10 +2418,20 @@ ENDJS
$output .= $home_server_pick.
&Apache::lonhtmlcommon::row_closure().
&Apache::lonhtmlcommon::row_headline().
- ''.&Apache::loncommon::help_open_topic('Course_Request_Clone').' '.$clonetitle.'
'.
+ ''.&Apache::loncommon::help_open_topic('Course_Request_Clone').' '.$clonetitle.
+ ''.
+ '
'.
&Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_headline().
+ ' '."\n";
+ &Apache::lonhtmlcommon::end_pick_box().'
';
- &Apache::lonnet::logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
- } elsif ($statusresult ne 'ok') {
- $output .= ''.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).'
';
- &Apache::lonnet::logthis("Error saving course request status for $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult");
- }
+ ($storeresult,my $updateresult) =
+ &Apache::loncoursequeueadmin::update_coursereq_status(\%reqhash,$dom,
+ $cnum,$reqstatus,'request');
if ($modified && $queued && $storeresult eq 'ok') {
if ($crstype eq 'community') {
$output .= '
'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'
'; + } + if ($updateresult) { + $output .= $updateresult; } } if ($creationresult ne '') { @@ -3139,8 +3177,8 @@ sub notification_information { ''; } else { $output .= '