Log Message:
-----------
backward port from HEAD
Tags:
----
rel-2-4-patches
Modified Files:
--------------
webwork2/lib/WeBWorK:
Authz.pm
webwork2/lib/WeBWorK/ContentGenerator/Instructor:
PGProblemEditor.pm
Revision Data
-------------
Index: Authz.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/Authz.pm,v
retrieving revision 1.32.2.4
retrieving revision 1.32.2.4.2.1
diff -Llib/WeBWorK/Authz.pm -Llib/WeBWorK/Authz.pm -u -r1.32.2.4 -r1.32.2.4.2.1
--- lib/WeBWorK/Authz.pm
+++ lib/WeBWorK/Authz.pm
@@ -259,6 +259,11 @@
$set->version_id eq $verNum ) {
# then we can just use this set and skip the rest
+ } elsif ( $setName eq 'Undefined_Set' and
+ $self->hasPermissions($userName, "access_instructor_tools") ) {
+ # this is the case of previewing a problem
+ # from a 'try it' link
+ return 0;
} else {
if ($db->existsSetVersion($effectiveUserName,$setName,$verNum)) {
$set = $db->getMergedSetVersion($effectiveUserName,$setName,$verNum);
Index: PGProblemEditor.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm,v
retrieving revision 1.90.4.1.2.3
retrieving revision 1.90.4.1.2.4
diff -Llib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm -Llib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm -u -r1.90.4.1.2.3 -r1.90.4.1.2.4
--- lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
@@ -1740,6 +1740,7 @@
my $viewURL = $self->systemLink($problemPage,
params=>{
sourceFilePath => $relativeOutputFilePath, #The path relative to the templates directory is required.
+ problemSeed => $problemSeed,
edit_level => $edit_level,
file_type => $new_file_type,
status_message => uri_escape($self->{status_message})
|
