vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 68432 - Debug request/email 

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@915 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2010-08-26 11:39:43 +00:00
parent 15a451fa7b
commit 17f4f14c41
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/t/test_create_user_accounts.t
View File

@ -98,7 +98,7 @@ _ok(!$sel->is_text_present("Open a New Account"), "No link named 'Open a New Acc
$sel->open_ok("/$config->{bugzilla_installation}/createaccount.cgi");
$sel->title_is("Account Creation Disabled");
$error_msg = trim($sel->get_text("error_msg"));
_ok($error_msg =~ /^User account creation has been disabled. New accounts must be created by an administrator/,
_ok($error_msg =~ /^User account creation has been disabled/,
"User account creation disabled");
# Re-enable user account creation.

4
qa/t/test_flags.t
View File

@ -320,7 +320,7 @@ my $attachment1_id = $1;
# Now create another attachment, and set requestees.
$sel->click_ok("//a[contains(text(),'Create\n Another Attachment to Bug $bug1_id')]");
$sel->click_ok("//a[contains(text(),'Create Another Attachment to Bug $bug1_id')]");
$sel->wait_for_page_to_load_ok(WAIT_TIME);
$sel->title_is("Create New Attachment for Bug #$bug1_id");
$sel->type_ok("data", "/var/www/html/selenium/bugzilla/patch.diff");
@ -344,7 +344,7 @@ my $attachment2_id = $1;
# Create a third attachment, but we now set the MIME type manually.
$sel->click_ok("//a[contains(text(),'Create\n Another Attachment to Bug $bug1_id')]");
$sel->click_ok("//a[contains(text(),'Create Another Attachment to Bug $bug1_id')]");
$sel->wait_for_page_to_load_ok(WAIT_TIME);
$sel->title_is("Create New Attachment for Bug #$bug1_id");
$sel->type_ok("data", "/var/www/html/selenium/bugzilla/patch.diff");

12
template/en/default/request/email.txt.tmpl
View File

@ -29,7 +29,7 @@
[% attidsummary = attachment.id _ ': ' _ attachment.description %]
[% flagtype_name = flag ? flag.type.name : old_flag.type.name %]
[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" ,
'?' => "asked" } %]
'?' => "requested" } %]
[% to_identity = "" %]
[% on_behalf_of = 0 %]
@ -134,13 +134,13 @@ pre { font-family: Consolas, monospace; font-size: 100%; }
[% PROCESS userlink u=user %] has reassigned [% PROCESS userlink u=flag.setter %]'s request
for <b>[% flag.type.name %]</b> [% IF flag.requestee %]to [% PROCESS userlink u=flag.requestee %][% END %]:
[% ELSE %]
[% PROCESS userlink u=user %] has [% statuses.${flag.status} %]
[% IF flag.status == '?' AND flag.setter.id == user.id %]
[% PROCESS userlink u=user %] has [% flag.status ? statuses.${flag.status} : statuses.X %]
[% IF flag AND flag.status == '?' AND flag.setter.id == user.id %]
[%+ PROCESS userlink u=flag.requestee %] for
[% ELSIF flag.status != '?' AND flag.requester %]
[%+ PROCESS userlink u=flag.requester %]'s request for
[% ELSIF old_flag AND old_flag.status == '?' AND old_flag.setter %]
[%+ PROCESS userlink u=old_flag.setter %]'s request for
[% END %]
<b>[% flag.type.name %]</b>:
<b>[% flag ? flag.type.name : old_flag.type.name %]</b>:
[% END %]
</p>
<p><a style="font-size: 120%" href="[% urlbase %]show_bug.cgi?id=[% bug.bug_id %]">[% terms.Bug %] [%+ bugidsummary %]</a>