summaryrefslogtreecommitdiffstats
path: root/extensions/FlagTypeComment/Extension.pm
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/FlagTypeComment/Extension.pm')
-rw-r--r--extensions/FlagTypeComment/Extension.pm264
1 files changed, 129 insertions, 135 deletions
diff --git a/extensions/FlagTypeComment/Extension.pm b/extensions/FlagTypeComment/Extension.pm
index e7b34113d..e26b08b27 100644
--- a/extensions/FlagTypeComment/Extension.pm
+++ b/extensions/FlagTypeComment/Extension.pm
@@ -39,31 +39,19 @@ our $VERSION = '1';
################
sub db_schema_abstract_schema {
- my ($self, $args) = @_;
- $args->{'schema'}->{'flagtype_comments'} = {
- FIELDS => [
- type_id => {
- TYPE => 'SMALLINT(6)',
- NOTNULL => 1,
- REFERENCES => {
- TABLE => 'flagtypes',
- COLUMN => 'id',
- DELETE => 'CASCADE'
- }
- },
- on_status => {
- TYPE => 'CHAR(1)',
- NOTNULL => 1
- },
- comment => {
- TYPE => 'MEDIUMTEXT',
- NOTNULL => 1
- },
- ],
- INDEXES => [
- flagtype_comments_idx => ['type_id'],
- ],
- };
+ my ($self, $args) = @_;
+ $args->{'schema'}->{'flagtype_comments'} = {
+ FIELDS => [
+ type_id => {
+ TYPE => 'SMALLINT(6)',
+ NOTNULL => 1,
+ REFERENCES => {TABLE => 'flagtypes', COLUMN => 'id', DELETE => 'CASCADE'}
+ },
+ on_status => {TYPE => 'CHAR(1)', NOTNULL => 1},
+ comment => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
+ ],
+ INDEXES => [flagtype_comments_idx => ['type_id'],],
+ };
}
#############
@@ -71,83 +59,89 @@ sub db_schema_abstract_schema {
#############
sub template_before_process {
- my ($self, $args) = @_;
- my ($vars, $file) = @$args{qw(vars file)};
+ my ($self, $args) = @_;
+ my ($vars, $file) = @$args{qw(vars file)};
- return unless Bugzilla->user->id;
- if (grep { $_ eq $file } FLAGTYPE_COMMENT_TEMPLATES) {
- _set_ftc_states($file, $vars);
- }
+ return unless Bugzilla->user->id;
+ if (grep { $_ eq $file } FLAGTYPE_COMMENT_TEMPLATES) {
+ _set_ftc_states($file, $vars);
+ }
}
sub _set_ftc_states {
- my ($file, $vars) = @_;
- my $dbh = Bugzilla->dbh;
-
- my $ftc_flags;
- my $db_result;
- if ($file =~ /^admin\//) {
- # admin
- my $type = $vars->{'type'} || return;
- my ($target_type, $id);
- if (blessed($type)) {
- ($target_type, $id) = ($type->target_type, $type->id);
- } else {
- ($target_type, $id) = ($type->{target_type}, $type->{id});
- trick_taint($id) if $id;
- }
- if ($target_type eq 'bug') {
- return unless FLAGTYPE_COMMENT_BUG_FLAGS;
- } else {
- return unless FLAGTYPE_COMMENT_ATTACHMENT_FLAGS;
- }
- if ($id) {
- $db_result = $dbh->selectall_arrayref(
- "SELECT type_id AS flagtype, on_status AS state, comment AS text
+ my ($file, $vars) = @_;
+ my $dbh = Bugzilla->dbh;
+
+ my $ftc_flags;
+ my $db_result;
+ if ($file =~ /^admin\//) {
+
+ # admin
+ my $type = $vars->{'type'} || return;
+ my ($target_type, $id);
+ if (blessed($type)) {
+ ($target_type, $id) = ($type->target_type, $type->id);
+ }
+ else {
+ ($target_type, $id) = ($type->{target_type}, $type->{id});
+ trick_taint($id) if $id;
+ }
+ if ($target_type eq 'bug') {
+ return unless FLAGTYPE_COMMENT_BUG_FLAGS;
+ }
+ else {
+ return unless FLAGTYPE_COMMENT_ATTACHMENT_FLAGS;
+ }
+ if ($id) {
+ $db_result = $dbh->selectall_arrayref(
+ "SELECT type_id AS flagtype, on_status AS state, comment AS text
FROM flagtype_comments
- WHERE type_id = ?",
- { Slice => {} }, $id);
- }
- } else {
- # creating/editing attachment / viewing bug
- my $bug;
- if (exists $vars->{'bug'}) {
- $bug = $vars->{'bug'};
- } elsif (exists $vars->{'attachment'}) {
- $bug = $vars->{'attachment'}->{bug};
- } else {
- return;
- }
-
- my $flag_types = Bugzilla::FlagType::match({
- 'target_type' => ($file =~ /^bug/ ? 'bug' : 'attachment'),
- 'product_id' => $bug->product_id,
- 'component_id' => $bug->component_id,
- 'bug_id' => $bug->id,
- 'active_or_has_flags' => $bug->id,
- });
-
- if (@$flag_types) {
- my $types = join(',', map { $_->id } @$flag_types);
- my $states = "'" . join("','", FLAGTYPE_COMMENT_STATES) . "'";
- $db_result = $dbh->selectall_arrayref(
- "SELECT type_id AS flagtype, on_status AS state, comment AS text
- FROM flagtype_comments
- WHERE type_id IN ($types) AND on_status IN ($states)",
- { Slice => {} });
- }
- else {
- $db_result = [];
- }
+ WHERE type_id = ?", {Slice => {}}, $id
+ );
+ }
+ }
+ else {
+ # creating/editing attachment / viewing bug
+ my $bug;
+ if (exists $vars->{'bug'}) {
+ $bug = $vars->{'bug'};
+ }
+ elsif (exists $vars->{'attachment'}) {
+ $bug = $vars->{'attachment'}->{bug};
+ }
+ else {
+ return;
}
- foreach my $row (@$db_result) {
- $ftc_flags->{$row->{'flagtype'}} ||= {};
- $ftc_flags->{$row->{'flagtype'}}{$row->{'state'}} = $row->{text};
+ my $flag_types = Bugzilla::FlagType::match({
+ 'target_type' => ($file =~ /^bug/ ? 'bug' : 'attachment'),
+ 'product_id' => $bug->product_id,
+ 'component_id' => $bug->component_id,
+ 'bug_id' => $bug->id,
+ 'active_or_has_flags' => $bug->id,
+ });
+
+ if (@$flag_types) {
+ my $types = join(',', map { $_->id } @$flag_types);
+ my $states = "'" . join("','", FLAGTYPE_COMMENT_STATES) . "'";
+ $db_result = $dbh->selectall_arrayref(
+ "SELECT type_id AS flagtype, on_status AS state, comment AS text
+ FROM flagtype_comments
+ WHERE type_id IN ($types) AND on_status IN ($states)", {Slice => {}}
+ );
+ }
+ else {
+ $db_result = [];
}
+ }
- $vars->{'ftc_states'} = [ FLAGTYPE_COMMENT_STATES ];
- $vars->{'ftc_flags'} = $ftc_flags;
+ foreach my $row (@$db_result) {
+ $ftc_flags->{$row->{'flagtype'}} ||= {};
+ $ftc_flags->{$row->{'flagtype'}}{$row->{'state'}} = $row->{text};
+ }
+
+ $vars->{'ftc_states'} = [FLAGTYPE_COMMENT_STATES];
+ $vars->{'ftc_flags'} = $ftc_flags;
}
#########
@@ -155,55 +149,55 @@ sub _set_ftc_states {
#########
sub flagtype_end_of_create {
- my ($self, $args) = @_;
- _set_flagtypes($args->{type});
+ my ($self, $args) = @_;
+ _set_flagtypes($args->{type});
}
sub flagtype_end_of_update {
- my ($self, $args) = @_;
- _set_flagtypes($args->{type});
+ my ($self, $args) = @_;
+ _set_flagtypes($args->{type});
}
sub _set_flagtypes {
- my $flag_type = shift;
- my $flagtype_id = $flag_type->id;
- my $input = Bugzilla->input_params;
- my $dbh = Bugzilla->dbh;
-
- foreach my $state (FLAGTYPE_COMMENT_STATES) {
- next if (!defined $input->{"ftc_${flagtype_id}_$state"}
- && !defined $input->{"ftc_new_$state"});
-
- my $text = $input->{"ftc_${flagtype_id}_$state"} || $input->{"ftc_new_$state"} || '';
- $text =~ s/\r\n/\n/g;
- trick_taint($text);
-
- if ($text ne '') {
- if ($dbh->selectrow_array(
- "SELECT 1 FROM flagtype_comments WHERE type_id=? AND on_status=?",
- undef,
- $flagtype_id, $state)
- ) {
- $dbh->do(
- "UPDATE flagtype_comments SET comment=?
- WHERE type_id=? AND on_status=?",
- undef,
- $text, $flagtype_id, $state);
- } else {
- $dbh->do(
- "INSERT INTO flagtype_comments(type_id, on_status, comment)
- VALUES (?, ?, ?)",
- undef,
- $flagtype_id, $state, $text);
- }
-
- } else {
- $dbh->do(
- "DELETE FROM flagtype_comments WHERE type_id=? AND on_status=?",
- undef,
- $flagtype_id, $state);
- }
+ my $flag_type = shift;
+ my $flagtype_id = $flag_type->id;
+ my $input = Bugzilla->input_params;
+ my $dbh = Bugzilla->dbh;
+
+ foreach my $state (FLAGTYPE_COMMENT_STATES) {
+ next
+ if (!defined $input->{"ftc_${flagtype_id}_$state"}
+ && !defined $input->{"ftc_new_$state"});
+
+ my $text
+ = $input->{"ftc_${flagtype_id}_$state"} || $input->{"ftc_new_$state"} || '';
+ $text =~ s/\r\n/\n/g;
+ trick_taint($text);
+
+ if ($text ne '') {
+ if ($dbh->selectrow_array(
+ "SELECT 1 FROM flagtype_comments WHERE type_id=? AND on_status=?", undef,
+ $flagtype_id, $state
+ ))
+ {
+ $dbh->do(
+ "UPDATE flagtype_comments SET comment=?
+ WHERE type_id=? AND on_status=?", undef, $text, $flagtype_id, $state
+ );
+ }
+ else {
+ $dbh->do(
+ "INSERT INTO flagtype_comments(type_id, on_status, comment)
+ VALUES (?, ?, ?)", undef, $flagtype_id, $state, $text
+ );
+ }
+
+ }
+ else {
+ $dbh->do("DELETE FROM flagtype_comments WHERE type_id=? AND on_status=?",
+ undef, $flagtype_id, $state);
}
+ }
}
__PACKAGE__->NAME;
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-05-03 09:06:06 +0200