Fix for bug 215319: changes "flag requester" field in boolean charts to "flag request...

r=justdave

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 683c2e0573146c89a51fa55d82894c17d01642f4..b7f4e189c1e9ae57e9b0db8d8e5b074b1b0c487a 100644 (file)
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -623,12 +623,12 @@ sub init {
                 $term = "0=0";
              }
          },
-         "^requesters.login_name," => sub {
+         "^requestees.login_name," => sub {
              push(@supptables, "flags flags_$chartid");
              push(@wherepart, "bugs.bug_id = flags_$chartid.bug_id");
-             push(@supptables, "profiles requesters_$chartid");
-             push(@wherepart, "flags_$chartid.requester_id = requesters_$chartid.userid");
-             $f = "requesters_$chartid.login_name";
+             push(@supptables, "profiles requestees_$chartid");
+             push(@wherepart, "flags_$chartid.requestee_id = requestees_$chartid.userid");
+             $f = "requestees_$chartid.login_name";
          },
          "^setters.login_name," => sub {
              push(@supptables, "flags flags_$chartid");

diff --git a/checksetup.pl b/checksetup.pl
index 434c847dfc151ffd310d851a4a41fd94620c89ee..bb28e5717472e66ebc6442a493cb993538b05315 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -2153,8 +2153,11 @@ AddFDef("remaining_time", "Remaining Hours", 0);
 # Oops. Bug 163299
 $dbh->do("DELETE FROM fielddefs WHERE name='cc_accessible'");
 
+# Oops. Bug 215319
+$dbh->do("DELETE FROM fielddefs WHERE name='requesters.login_name'");
+
 AddFDef("flagtypes.name", "Flag", 0);
-AddFDef("requesters.login_name", "Flag Requester", 0);
+AddFDef("requestees.login_name", "Flag Requestee", 0);
 AddFDef("setters.login_name", "Flag Setter", 0);
 AddFDef("work_time", "Hours Worked", 0);
 AddFDef("percentage_complete", "Percentage Complete", 0);