summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Search.pm8
-rwxr-xr-xchecksetup.pl5
2 files changed, 8 insertions, 5 deletions
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 23bb34eae..86efb2ad0 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -728,12 +728,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 0d1ca477a..68dd308e6 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -2204,8 +2204,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);