Skip to content

Commit

Permalink
Merge branch 'main' into enable-readable-status
Browse files Browse the repository at this point in the history
  • Loading branch information
justdave authored Sep 4, 2023
2 parents da36506 + 5687d97 commit ff48958
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These are supported funding model platforms

github: bugzilla
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ For the full list of features, you can check the
## Demo

You can try Bugzilla on the
[test instance](https://harmony.bugzilla.ninja)
[test instance](https://bugzilla-dev.allizom.org)

![Screengrab](images/bzgif.gif)

Expand Down Expand Up @@ -47,7 +47,7 @@ You can report bugs on the

## Community

* [#bugzilla on librachat](irc://irc.libra.chat/bugzilla)
* [#bugzilla on liberachat](irc://irc.libera.chat/bugzilla) [webchat](https://web.libera.chat/#bugzilla)
* [Matrix](https://matrix.to/#/#bugzilla:mozilla.org)
* [Twitter](https://twitter.com/bugzilla)
* [Development Forum](https://www.mozilla.org/en-US/about/forums/#dev-apps-bugzilla)
Expand Down
14 changes: 8 additions & 6 deletions extensions/FlagTypeComment/Extension.pm
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ sub _set_ftc_states {
my $dbh = Bugzilla->dbh;

my $ftc_flags;
my $db_result;
my $db_result = [];
if ($file =~ /^admin\//) {

# admin
Expand Down Expand Up @@ -121,11 +121,13 @@ sub _set_ftc_states {

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 => {}}
);
if ($types) {
$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 => {}}
);
}
}

foreach my $row (@$db_result) {
Expand Down

0 comments on commit ff48958

Please sign in to comment.