From: Mike G. v. a. <we...@ma...> - 2005-06-25 16:24:30
|
Log Message: ----------- Fixed an incorrect error message when using the revert button. Modified Files: -------------- webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor: PGProblemEditor.pm Revision Data ------------- Index: PGProblemEditor.pm =================================================================== RCS file: /webwork/cvs/system/webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm,v retrieving revision 1.53 retrieving revision 1.54 diff -Llib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm -Llib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm -u -r1.53 -r1.54 --- lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm +++ lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm @@ -296,7 +296,7 @@ # FIXME: even with an error we still open a new page because of the target specified in the form - # Some cases do not need a redirect: revert, fresh_edit + # Some cases do not need a redirect: save, refresh, save_as, add_problem_to_set, add_header_to_set my $action = $self->{action}; return unless $action eq 'save' @@ -673,13 +673,6 @@ ################################################################################ # Utilities ################################################################################ - -# saveFileChanges does most of the work. it is a separate method so that it can -# be called from either pre_header_initialize() or initilize(), depending on -# whether a redirect is needed or not. -# -# it actually does a lot more than save changes to the file being edited, and -# sometimes less. sub getFilePaths { my ($self, $setName, $problemNumber, $file_type, $TEMPFILESUFFIX) = @_; my $r = $self->r; @@ -823,6 +816,15 @@ $self->{inputFilePath} = (-r "$editFilePath.$TEMPFILESUFFIX") ? $tempFilePath : $editFilePath; } + +################################################################################ +# saveFileChanges does most of the work. it is a separate method so that it can +# be called from either pre_header_initialize() or initilize(), depending on +# whether a redirect is needed or not. +# +# it actually does a lot more than save changes to the file being edited, and +# sometimes less. +################################################################################ sub saveFileChanges { my ($self, $setName, $problemNumber, $file_type, $TEMPFILESUFFIX) = @_; my $r = $self->r; @@ -881,6 +883,7 @@ $outputFilePath = undef; $self->addgoodmessage("Reverting to original file $editFilePath"); $self->{problemPath} = $editFilePath; + $self->{inputFilePath}=$editFilePath; last ACTION_CASES; }; |