From: Kohei Yoshino Date: Mon, 15 Oct 2018 15:20:10 +0000 (-0400) Subject: Bug 1498362 - Shutter the "Powered By Mozilla" form X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54a265b2598aaee2e69c0b38878172b8dd8a1502;p=thirdparty%2Fbugzilla.git Bug 1498362 - Shutter the "Powered By Mozilla" form * Bug 1498362 - Shutter the "Powered By Mozilla" form * Fix text - why this is hardcoded --- diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm index 6c4ad2ef2..3a7dc6fd9 100644 --- a/extensions/BMO/Extension.pm +++ b/extensions/BMO/Extension.pm @@ -2737,8 +2737,6 @@ sub app_startup { ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Infrastructure & Operations', 'format' => 'itrequest' } ); $r->any( '/:REWRITE_mozlist' => [ REWRITE_mozlist => qr{form[\.:]mozlist} ] ) ->to( 'CGI#enter_bug_cgi' => { 'product' => 'mozilla.org', 'format' => 'mozlist' } ); - $r->any( '/:REWRITE_poweredby' => [ REWRITE_poweredby => qr{form[\.:]poweredby} ] ) - ->to( 'CGI#enter_bug_cgi' => { 'product' => 'mozilla.org', 'format' => 'poweredby' } ); $r->any( '/:REWRITE_presentation' => [ REWRITE_presentation => qr{form[\.:]presentation} ] ) ->to( 'cgi#enter_bug_cgi' => { 'product' => 'mozilla.org', 'format' => 'presentation' } ); $r->any( '/:REWRITE_trademark' => [ REWRITE_trademark => qr{form[\.:]trademark} ] ) diff --git a/extensions/BMO/template/en/default/bug/create/create-poweredby.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-poweredby.html.tmpl deleted file mode 100644 index d6243c73b..000000000 --- a/extensions/BMO/template/en/default/bug/create/create-poweredby.html.tmpl +++ /dev/null @@ -1,87 +0,0 @@ -[%# 1.0@bugzilla.org %] -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Gervase Markham - # Ville Skytta - # John Hoogstrate - #%] - -[% PROCESS global/variables.none.tmpl %] - -[% PROCESS global/header.html.tmpl - title = "Powered by Mozilla Logo Requests" -%] - -[% USE Bugzilla %] - -

If you are interested in using the Powered by Mozilla logo, -please provide some information about your application or product.

- -

Please use this form for Powered by Mozilla logo requests only.

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Application or Product Name: - -
URL (optional): - -
Comments (optional): - -
-
- -
- - -
- -

Thanks for contacting us. - You will be notified by email of any progress made in resolving your - request. -

- -[% PROCESS global/footer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl b/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl index 0d37a1386..cdc2e73e2 100644 --- a/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl +++ b/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl @@ -37,10 +37,6 @@ custom_forms = { title => "Mozilla Gear Request", group => "mozilla-employee-confidential", }, - { - link => "form.poweredby", - title => "Powered by Mozilla Logo Requests", - }, { link => "form.mozlist", title => "Mozilla Discussion Forum Requests", @@ -63,10 +59,6 @@ custom_forms = { title => "Brand Engagement Initiation Form", group => "mozilla-employee-confidential", }, - { - link => "form.poweredby", - title => "Powered by Mozilla Logo Requests", - }, { link => "form.comm.newsletter", title => "Mozilla Communities Newsletter", diff --git a/qa/t/test_bmo_enter_new_bug.t b/qa/t/test_bmo_enter_new_bug.t index 5f015ab64..021e25f06 100644 --- a/qa/t/test_bmo_enter_new_bug.t +++ b/qa/t/test_bmo_enter_new_bug.t @@ -228,22 +228,6 @@ $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->is_text_present_ok('has been added to the database', 'Bug created'); my $legal_bug_id = $sel->get_value('//input[@name="id" and @type="hidden"]'); -# poweredby - -_check_product('Websites', 'other'); -_check_component('Websites', 'www.mozilla.org'); -_check_user('liz@mozilla.com'); - -$sel->open_ok("/$config->{bugzilla_installation}/enter_bug.cgi?product=Websites&format=poweredby"); -$sel->wait_for_page_to_load_ok(WAIT_TIME); -$sel->title_is("Powered by Mozilla Logo Requests", "Open custom bug entry form - poweredby"); -$sel->type_ok("short_desc", "Bug created by Selenium", "Enter bug summary"); -$sel->type_ok("comment", "--- Bug created by Selenium ---", "Enter bug description"); -$sel->click_ok("commit", undef, "Submit bug data to post_bug.cgi"); -$sel->wait_for_page_to_load_ok(WAIT_TIME); -$sel->is_text_present_ok('has been added to the database', 'Bug created'); -my $poweredby_bug_id = $sel->get_value('//input[@name="id" and @type="hidden"]'); - set_parameters($sel, { "Bug Fields" => {"useclassification-on" => undef} }); logout($sel); diff --git a/qa/t/test_bug_edit.t b/qa/t/test_bug_edit.t index 01037aa1e..45f8225a3 100644 --- a/qa/t/test_bug_edit.t +++ b/qa/t/test_bug_edit.t @@ -320,7 +320,7 @@ check_page_load($sel, WAIT_TIME, q{http://HOSTNAME:8000/bmo/post_bug.cgi}); $sel->title_is("Suspicious Action"); $sel->is_text_present_ok("you have no valid token for the create_bug action"); $sel->click_ok('//input[@value="Confirm Changes"]'); -check_page_load($sel, WAIT_TIME, q{http://HOSTNAME:8000/bmo/show_bug.cgi?id=15}); +check_page_load($sel, WAIT_TIME, q{http://HOSTNAME:8000/bmo/show_bug.cgi?id=14}); $sel->is_text_present_ok('has been added to the database', 'Bug created'); $sel->type_ok("comment", "New comment not allowed"); $sel->click_ok("commit");