From 5f173728faa3420461cb6f77b32f392bd58a1777 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Tue, 21 Jun 2005 02:16:26 +0000 Subject: Bug 76507: Replace "owner" by "assignee" (and "initial" by "default") - Patch by Tiago R. Mello r=LpSolit a=myk --- buglist.cgi | 2 +- checksetup.pl | 6 +++--- contrib/bugmail_help.html | 4 ++-- defparams.pl | 2 +- docs/xml/administration.xml | 16 +++++++-------- docs/xml/customization.xml | 2 +- docs/xml/using.xml | 6 +++--- editusers.cgi | 2 +- editwhines.cgi | 2 +- importxml.pl | 10 ++++----- process_bug.cgi | 12 +++++------ quicksearchhack.html | 10 ++++----- template/en/default/account/prefs/email.html.tmpl | 2 +- .../admin/components/confirm-delete.html.tmpl | 8 ++++---- .../en/default/admin/components/create.html.tmpl | 4 ++-- .../en/default/admin/components/edit.html.tmpl | 8 ++++---- .../en/default/admin/components/list.html.tmpl | 4 ++-- .../en/default/admin/components/updated.html.tmpl | 10 ++++----- .../default/admin/users/confirm-delete.html.tmpl | 8 ++++---- template/en/default/bug/create/create.html.tmpl | 2 +- template/en/default/bug/knob.html.tmpl | 2 +- template/en/default/global/user-error.html.tmpl | 24 +++++++++++----------- template/en/default/list/edit-multiple.html.tmpl | 2 +- template/en/default/list/list.html.tmpl | 2 +- template/en/default/reports/components.html.tmpl | 6 +++--- template/en/default/search/form.html.tmpl | 2 +- 26 files changed, 79 insertions(+), 79 deletions(-) diff --git a/buglist.cgi b/buglist.cgi index c0ccf836c..106236175 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -862,7 +862,7 @@ while (my @row = $buglist_sth->fetchrow_array()) { $bug->{'opendate'} = DiffDate($bug->{'opendate'}); } - # Record the owner, product, and status in the big hashes of those things. + # Record the assignee, product, and status in the big hashes of those things. $bugowners->{$bug->{'assigned_to'}} = 1 if $bug->{'assigned_to'}; $bugproducts->{$bug->{'product'}} = 1 if $bug->{'product'}; $bugstatuses->{$bug->{'bug_status'}} = 1 if $bug->{'bug_status'}; diff --git a/checksetup.pl b/checksetup.pl index 369551131..57981a639 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -2231,7 +2231,7 @@ if ($comp_init_owner && $comp_init_owner->{TYPE} eq 'TINYTEXT') { my $initialownerid = $s2->fetchrow_array(); unless (defined $initialownerid) { - print "Warning: You have an invalid initial owner '$initialowner'\n" . + print "Warning: You have an invalid default assignee '$initialowner'\n" . "in component '$value' of program '$program'. !\n"; $initialownerid = 0; } @@ -2271,7 +2271,7 @@ if ($comp_init_qa && $comp_init_qa->{TYPE} eq 'TINYTEXT') { unless (defined $initialqacontactid) { if ($initialqacontact ne '') { - print "Warning: You have an invalid initial QA contact $initialqacontact' in program '$program', component '$value'!\n"; + print "Warning: You have an invalid default QA contact $initialqacontact' in program '$program', component '$value'!\n"; } $initialqacontactid = 0; } @@ -3528,7 +3528,7 @@ if (!$series_exists) { } } -AddFDef("owner_idle_time", "Time Since Owner Touched", 0); +AddFDef("owner_idle_time", "Time Since Assignee Touched", 0); # 2004-04-12 - Keep regexp-based group permissions up-to-date - Bug 240325 if ($dbh->bz_column_info("user_group_map", "isderived")) { diff --git a/contrib/bugmail_help.html b/contrib/bugmail_help.html index 00b0f5153..a2f89f260 100644 --- a/contrib/bugmail_help.html +++ b/contrib/bugmail_help.html @@ -112,8 +112,8 @@ hopefully valid value. @assigned_to The one to whom the bug is assigned to - no.
There is an initial owner for every product/version/component. - He owns the bug by default. The initial owner can only be found if + no.
There is a default assignee for every product/version/component. + He owns the bug by default. The default assignee can only be found if product, version and component are valid. diff --git a/defparams.pl b/defparams.pl index 8534615ab..47edf8a1a 100644 --- a/defparams.pl +++ b/defparams.pl @@ -811,7 +811,7 @@ Generally, this means one of three things: (2) You decide the bug doesn\'t belong to you, and you reassign it to someone else. (Hint: if you don\'t know who to reassign it to, make sure that the Component field seems reasonable, and then use the "Reassign bug to - owner of selected component" option.) + default assignee of selected component" option.) (3) You decide the bug belongs to you, but you can\'t solve it this moment. Just use the "Accept bug" command. diff --git a/docs/xml/administration.xml b/docs/xml/administration.xml index 36dcc14e9..2c4bbad92 100644 --- a/docs/xml/administration.xml +++ b/docs/xml/administration.xml @@ -193,7 +193,7 @@ This allows you to define an email address for each component, - in addition to that of the default owner, who will be sent + in addition to that of the default assignee, who will be sent carbon copies of incoming bugs. @@ -580,12 +580,12 @@ company. - Each component has a owner and (if you turned it on in the parameters), - a QA Contact. The owner should be the primary person who fixes bugs in + Each component has a default assignee and (if you turned it on in the parameters), + a QA Contact. The default assignee should be the primary person who fixes bugs in that component. The QA Contact should be the person who will ensure - these bugs are completely fixed. The Owner, QA Contact, and Reporter + these bugs are completely fixed. The Assignee, QA Contact, and Reporter will get email when new bugs are created in this Component and when - these bugs change. Default Owner and Default QA Contact fields only + these bugs change. Default Assignee and Default QA Contact fields only dictate the default assignments; these can be changed on bug submission, or at any later point in @@ -605,9 +605,9 @@ Fill out the "Component" field, a short "Description", - the "Initial Owner" and "Initial QA Contact" (if enabled.) + the "Default Assignee" and "Default QA Contact" (if enabled.) The Component and Description fields may contain HTML; - the "Initial Owner" field must be a login name + the "Default Assignee" field must be a login name already existing in the database. @@ -874,7 +874,7 @@ Only users with the ability to edit the bug may - set flags on bugs. This includes the owner, reporter, and + set flags on bugs. This includes the assignee, reporter, and any user with the editbugs permission. diff --git a/docs/xml/customization.xml b/docs/xml/customization.xml index 14ac3f86a..1eef16673 100644 --- a/docs/xml/customization.xml +++ b/docs/xml/customization.xml @@ -665,7 +665,7 @@ Certain marked sections should not be changed - these are the plumbing which makes the rest of the function work. In between those sections, you'll find snippets of code like: - # Allow the owner to change anything. + # Allow the assignee to change anything. if ($ownerid eq $whoid) { return 1; } diff --git a/docs/xml/using.xml b/docs/xml/using.xml index 45d2574da..4e63bac86 100644 --- a/docs/xml/using.xml +++ b/docs/xml/using.xml @@ -487,12 +487,12 @@ If your account is sufficiently empowered, you can make the same change to all the bugs in the list - for example, changing their - owner. + assignee. - Send mail to bug owners: + Send mail to bug assignees: - Sends mail to the owners of all bugs on the list. + Sends mail to the assignees of all bugs on the list. Edit Search: diff --git a/editusers.cgi b/editusers.cgi index 74ad463fd..371e2a612 100755 --- a/editusers.cgi +++ b/editusers.cgi @@ -404,7 +404,7 @@ if ($action eq 'search') { $vars->{'otheruser'} = $otherUser; $vars->{'editcomponents'} = UserInGroup('editcomponents'); - # If the user is initial owner or initial QA contact of a component, + # If the user is default assignee or default QA contact of a component, # then no deletion is possible. $vars->{'product_responsibilities'} = productResponsibilities($otherUserID); diff --git a/editwhines.cgi b/editwhines.cgi index e65a585d0..9c27bcd0a 100755 --- a/editwhines.cgi +++ b/editwhines.cgi @@ -203,7 +203,7 @@ if ($cgi->param('update')) { for my $sid (@scheduleids) { if ($cgi->param("remove_schedule_$sid")) { - # having the owner id in here is a security failsafe + # having the assignee id in here is a security failsafe $sth = $dbh->prepare("SELECT whine_schedules.id " . "FROM whine_schedules " . "LEFT JOIN whine_events " . diff --git a/importxml.pl b/importxml.pl index 8cf9a6179..b8e017412 100755 --- a/importxml.pl +++ b/importxml.pl @@ -531,13 +531,13 @@ for (my $k=1 ; $k <= $bugqty ; $k++) { push (@values, SqlQuote($exporterid) ); push (@query, "assigned_to"); $changed_owner = 1; - $err .= "The original owner of this bug does not have\n"; + $err .= "The original assignee of this bug does not have\n"; $err .= " an account here. Reassigning to the person who moved\n"; $err .= " it here, $exporter.\n"; if ( $bug_fields{'assigned_to'} ) { - $err .= " Previous owner was $bug_fields{'assigned_to'}.\n"; + $err .= " Previous assignee was $bug_fields{'assigned_to'}.\n"; } else { - $err .= " Previous owner is unknown.\n"; + $err .= " Previous assignee is unknown.\n"; } } @@ -550,13 +550,13 @@ for (my $k=1 ; $k <= $bugqty ; $k++) { $err .= "Unknown resolution \"$bug_fields{'resolution'}\".\n"; } - # if the bug's owner changed, mark the bug NEW, unless a valid + # if the bug's assignee changed, mark the bug NEW, unless a valid # resolution is set, which indicates that the bug should be closed. # if ( ($changed_owner) && (!$resolution[0]) ) { push (@values, SqlQuote("NEW")); push (@query, "bug_status"); - $err .= "Bug assigned to new owner, setting status to \"NEW\".\n"; + $err .= "Bug reassigned, setting status to \"NEW\".\n"; $err .= " Previous status was \""; $err .= (defined $bug_fields{'bug_status'})? $bug_fields{'bug_status'}:"unknown"; diff --git a/process_bug.cgi b/process_bug.cgi index 34444dfcf..d97474863 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -447,8 +447,8 @@ sub CheckCanChangeField { # variable which gets passed to the error template. # # $PrivilegesRequired = 0 : no privileges required; - # $PrivilegesRequired = 1 : the reporter, owner or an empowered user; - # $PrivilegesRequired = 2 : the owner or an empowered user; + # $PrivilegesRequired = 1 : the reporter, assignee or an empowered user; + # $PrivilegesRequired = 2 : the assignee or an empowered user; # $PrivilegesRequired = 3 : an empowered user. # Allow anyone with "editbugs" privs to change anything. @@ -468,7 +468,7 @@ sub CheckCanChangeField { # START DO_NOT_CHANGE # $reporterid, $ownerid and $qacontactid are caches of the results of - # the call to find out the owner, reporter and qacontact of the current bug. + # the call to find out the assignee, reporter and qacontact of the current bug. if ($lastbugid != $bugid) { SendSQL("SELECT reporter, assigned_to, qa_contact FROM bugs WHERE bug_id = $bugid"); @@ -477,7 +477,7 @@ sub CheckCanChangeField { } # END DO_NOT_CHANGE - # Allow the owner to change anything else. + # Allow the assignee to change anything else. if ($ownerid == $whoid) { return 1; } @@ -494,7 +494,7 @@ sub CheckCanChangeField { # The reporter may not: # - reassign bugs, unless the bugs are assigned to him; # in that case we will have already returned 1 above - # when checking for the owner of the bug. + # when checking for the assignee of the bug. if ($field eq "assigned_to") { $PrivilegesRequired = 2; return 0; @@ -1770,7 +1770,7 @@ foreach my $id (@idlist) { } # save off the old value for passing to Bugzilla::BugMail so - # the old owner can be notified + # the old assignee can be notified # if ($col eq 'assigned_to') { $old = ($old) ? DBID_to_name($old) : ""; diff --git a/quicksearchhack.html b/quicksearchhack.html index e4d387a81..d514082f8 100644 --- a/quicksearchhack.html +++ b/quicksearchhack.html @@ -47,8 +47,8 @@ The generic format for a ``word'' is  field1,...,fieldN:value1,...,valueM . A bug qualifies if at least one of the values occurs as a substring in at least one of the fields. -For example,  owner,reporter,qa:ibm,sun  -will give you bugs where the owner, reporter, or qa contact +For example,  assignee,reporter,qa:ibm,sun  +will give you bugs where the assignee, reporter, or qa contact has an email address that contains  ibm  or  sun . If only  value1,...,valueM  is given, @@ -123,7 +123,7 @@ for access speed):   - @owner + @assignee assignedto assignee, owner Assignee ("assigned_to") @@ -317,8 +317,8 @@ Examples for some useful abbreviations: high-priority bugs - @owner - assignedto:owner + @assignee + assignedto:assignee