projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-1' of https://github.com/gjones2/Freeside
[freeside.git]
/
rt
/
lib
/
RT
/
Ticket.pm
diff --git
a/rt/lib/RT/Ticket.pm
b/rt/lib/RT/Ticket.pm
index
577c444
..
5f76e05
100755
(executable)
--- a/
rt/lib/RT/Ticket.pm
+++ b/
rt/lib/RT/Ticket.pm
@@
-2199,14
+2199,16
@@
sub Comment {
}
$args{'NoteType'} = 'Comment';
}
$args{'NoteType'} = 'Comment';
+ $RT::Handle->BeginTransaction();
if ($args{'DryRun'}) {
if ($args{'DryRun'}) {
- $RT::Handle->BeginTransaction();
$args{'CommitScrips'} = 0;
}
my @results = $self->_RecordNote(%args);
if ($args{'DryRun'}) {
$RT::Handle->Rollback();
$args{'CommitScrips'} = 0;
}
my @results = $self->_RecordNote(%args);
if ($args{'DryRun'}) {
$RT::Handle->Rollback();
+ } else {
+ $RT::Handle->Commit();
}
return(@results);
}
return(@results);
@@
-2245,10
+2247,10
@@
sub Correspond {
or ( $self->CurrentUserHasRight('ModifyTicket') ) ) {
return ( 0, $self->loc("Permission Denied"), undef );
}
or ( $self->CurrentUserHasRight('ModifyTicket') ) ) {
return ( 0, $self->loc("Permission Denied"), undef );
}
+ $args{'NoteType'} = 'Correspond';
- $
args{'NoteType'} = 'Correspond';
+ $
RT::Handle->BeginTransaction();
if ($args{'DryRun'}) {
if ($args{'DryRun'}) {
- $RT::Handle->BeginTransaction();
$args{'CommitScrips'} = 0;
}
$args{'CommitScrips'} = 0;
}
@@
-2265,6
+2267,8
@@
sub Correspond {
if ($args{'DryRun'}) {
$RT::Handle->Rollback();
if ($args{'DryRun'}) {
$RT::Handle->Rollback();
+ } else {
+ $RT::Handle->Commit();
}
return (@results);
}
return (@results);