@@ -853,6 +853,6 @@
%
% # If achievements enabled, check to see if there are new ones and output them. Use the first
% # problem to seed the data. However, all of the problems will be provided to the achievement evaluator.
-% if ($ce->{achievementsEnabled} && $c->{will}{recordAnswers} && $c->{submitAnswers} && $setID ne 'Undefined_Set') {
+% if ($ce->{achievementsEnabled} && $c->{will}{recordAnswers} && $c->{submitAnswers}) {
<%= checkForAchievements($problems->[0], $c, setVersion => $setVersionID) =%>
% }
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep
index 0d1a7ffc49..c47b441bc4 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep
@@ -20,9 +20,9 @@
% # If it is an absolute path make it relative.
% $shortFilePath =~ s|^/*|| if $shortFilePath =~ m|^/|;
%
-% # Don't add to or replace problems in sets or replace set/hardcopy headers if the set is the Undefined_Set or
+% # Don't add to or replace problems in sets or replace set/hardcopy headers if the set is undefined or
% # if the problem is the blank_problem or a sample problem.
-% my $fileIsAssociatedWithSet = defined $c->{setID} && $c->{setID} ne 'Undefined_Set' && !$isTemplate;
+% my $fileIsAssociatedWithSet = defined $c->{setID} && !$isTemplate;
%
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep
index fc4d746893..c628b0128d 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep
@@ -6,16 +6,6 @@
<%== maketext('Save to [_1] and View', tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath}))) =%>
- % unless ($c->{file_type} eq 'hardcopy_theme') {
-
- <%= check_box
- newWindowSave => 1,
- id => 'newWindowSave',
- class => 'form-check-input',
- $c->{file_type} eq 'hardcopy_header' ? (checked => undef) : () =%>
- <%= label_for newWindowSave => maketext('Open in new window'), class => 'form-check-label' =%>
-
- % }
<%= hidden_field 'action.save.source_file' => $c->{editFilePath} =%>
% # Backup options
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep
index 86044cb581..a5208323f5 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep
@@ -35,12 +35,4 @@
% }
- % unless ($c->{file_type} eq 'hardcopy_theme') {
-
-
- <%= check_box 'newWindowView' => 1, id => 'newWindowView', class => 'form-check-input' =%>
- <%= label_for newWindowView => maketext('Open in new window'), class => 'form-check-label' =%>
-
-
- % }
diff --git a/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep b/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep
index 81d5824dc6..f30c026e6a 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep
@@ -579,8 +579,7 @@
<% end =%>
% my $problemLink;
% if ($isGatewaySet) {
- % # If editing a set version, then open the actual set version.
- % # Otherwise, the best that can be done is to use an undefined set.
+ % # Only link to a test when editing a test version.
% if ($editingSetVersion) {
% my ($problemNumber, $pageNumber) =
% get_test_problem_position($db, $problemToShow);
@@ -596,25 +595,6 @@
% currentPage => $pageNumber
% }
% )->fragment("prob$problemNumber");
- % } else {
- % $problemLink = $c->systemLink(
- % url_for(
- % 'gateway_quiz',
- % setID => 'Undefined_Set',
- % problemID => '1'
- % ),
- % params => {
- % effectiveUser => @editForUser == 1 ? $editForUser[0]
- % : $authen->{user_id},
- % problemSeed => $problemToShow
- % ? $problemToShow->problem_seed
- % : '',
- % sourceFilePath => $problemToShow
- % && $problemToShow->source_file
- % ? $problemToShow->source_file
- % : $globalProblems->{$problemID}->source_file
- % }
- % );
% }
% } else {
% $problemLink = $c->systemLink(
@@ -630,19 +610,21 @@
% }
% );
% }
- <%= link_to $problemLink,
- class => 'psd_view btn btn-secondary btn-sm'
- . (@editForUser ? '' : ' px-1 px-sm-2'),
- target => 'WW_View',
- data => {
- bs_toggle => 'tooltip',
- bs_placement => 'top',
- bs_title => maketext('Open in New Window')
- },
- begin =%>
-
-
<%= maketext('View') =%>
- <% end =%>
+ % if ($problemLink) {
+ <%= link_to $problemLink,
+ class => 'psd_view btn btn-secondary btn-sm'
+ . (@editForUser ? '' : ' px-1 px-sm-2'),
+ target => 'WW_View',
+ data => {
+ bs_toggle => 'tooltip',
+ bs_placement => 'top',
+ bs_title => maketext('Open in New Window')
+ },
+ begin =%>
+
+
<%= maketext('View') =%>
+ <% end =%>
+ % }
% }
% if ($authz->hasPermissions($authen->{user_id}, 'problem_grader')) {
<%= link_to $c->systemLink(url_for(
diff --git a/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep b/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep
index 33d5822c4e..ed4ba0ceed 100644
--- a/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep
@@ -8,11 +8,6 @@
% ($isMO, $isstatic) = $c->getDBextras($sourceFileName);
% }
%
-% # Determine if the target set is a gateway assignment.
-% my $setRecord =
- % (defined param('local_sets') && param('local_sets') ne '') ? $db->getGlobalSet(param('local_sets')) : undef;
-% my $isGatewaySet = defined $setRecord && $setRecord->assignment_type =~ /gateway/;
-%
% my $noshowclass = $sourceFileData->{morelt} ? "MLT$sourceFileData->{morelt}" : "NS$cnt";
% if ($sourceFileData->{children}) {
% my $numchild = @{ $sourceFileData->{children} };
@@ -278,11 +273,7 @@
% }
<%= link_to $c->systemLink(
- url_for(
- 'instructor_problem_editor_withset_withproblem',
- setID => 'Undefined_Set',
- problemID => '1'
- ),
+ url_for('instructor_problem_editor'),
params => {
sourceFilePath => $sourceFileName,
problemSeed => $c->{problem_seed}
@@ -300,30 +291,6 @@
<%= maketext('Edit') =%>
<% end =%>
- <%= link_to $c->systemLink(
- url_for(
- $isGatewaySet ? 'gateway_quiz' : 'problem_detail',
- setID => 'Undefined_Set',
- $isGatewaySet ? () : (problemID => '1')
- ),
- params => {
- effectiveUser => $authen->{user_id},
- editMode => 'SetMaker',
- problemSeed => $c->{problem_seed},
- sourceFilePath => $sourceFileName,
- }
- ),
- id => "tryit$cnt",
- class => 'text-decoration-none btn btn-sm btn-secondary',
- target => 'WW_View',
- data => {
- bs_title => maketext('Try it'),
- bs_toggle => 'tooltip',
- bs_placement => 'top'
- },
- begin =%>
-
- <% end =%>
<%== maketext('Debugging information is shown below.') %>