From ea094fc3805e3ec1ae2bb7fcffabcef64be31dc8 Mon Sep 17 00:00:00 2001 From: "ghendricks%novell.com" Date: Tue, 17 Jun 2008 23:29:18 +0000 Subject: [PATCH] Multiple bug fixes git-svn-id: svn://10.0.0.236/trunk@252417 18797224-902f-48f8-a5cc-f745e15eee43 --- .../webtools/testopia/Bugzilla/Testopia/Search.pm | 4 ++++ .../testopia/code/post_bug-after_creation.pl | 8 ++++++-- .../links/testopia.html.tmpl | 8 ++++---- .../useful-links.html.tmpl/end/tr.html.tmpl | 8 ++++---- .../testopia/admin/plantypes/add.html.tmpl | 2 +- .../testopia/admin/plantypes/delete.html.tmpl | 2 +- .../testopia/admin/plantypes/edit.html.tmpl | 2 +- .../testopia/admin/plantypes/show.html.tmpl | 2 +- .../en/default/testopia/admin/show.html.tmpl | 2 +- .../default/testopia/attachment/choose.html.tmpl | 2 +- .../en/default/testopia/case/choose.html.tmpl | 2 +- .../en/default/testopia/case/list.html.tmpl | 1 + .../en/default/testopia/environment/add.html.tmpl | 2 +- .../testopia/environment/admin/show.html.tmpl | 2 +- .../default/testopia/environment/choose.html.tmpl | 2 +- .../default/testopia/environment/delete.html.tmpl | 2 +- .../default/testopia/environment/export.xml.tmpl | 2 +- .../default/testopia/environment/import.xml.tmpl | 2 +- .../default/testopia/environment/list.html.tmpl | 2 +- .../en/default/testopia/quicksearch.html.tmpl | 2 +- .../default/testopia/reports/bug-count.html.tmpl | 2 +- .../reports/bug-severity-status-form.html.tmpl | 2 +- .../testopia/reports/bug-stats-form.html.tmpl | 2 +- .../testopia/reports/build-coverage.html.tmpl | 2 +- .../testopia/reports/test-burnout-form.html.tmpl | 2 +- .../en/default/testopia/run/choose.html.tmpl | 2 +- .../en/default/testopia/tag/show.html.tmpl | 2 +- mozilla/webtools/testopia/testopia/js/case.js | 15 +++++++++++++-- mozilla/webtools/testopia/testopia/js/caserun.js | 1 + mozilla/webtools/testopia/testopia/js/run.js | 9 ++++----- mozilla/webtools/testopia/testopia/js/util.js | 3 ++- 31 files changed, 61 insertions(+), 40 deletions(-) diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm index 5cf168a38a0..91cb2237a10 100644 --- a/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm +++ b/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm @@ -389,6 +389,10 @@ sub init { push @supptables, "INNER JOIN test_case_plans AS case_plans ON test_cases.case_id = case_plans.case_id"; push @orderby, 'case_plans.plan_id'; } + elsif($order eq 'requirement' && $obj eq 'case_run'){ + push @supptables, "INNER JOIN test_cases ON test_cases.case_id = test_case_runs.case_id"; + push @orderby, 'test_cases.requirement'; + } elsif ($order eq 'priority') { if ($obj eq 'case_run'){ push @supptables, "INNER JOIN test_cases ON test_cases.case_id = test_case_runs.case_id"; diff --git a/mozilla/webtools/testopia/extensions/testopia/code/post_bug-after_creation.pl b/mozilla/webtools/testopia/extensions/testopia/code/post_bug-after_creation.pl index 19fce47fb3e..6b11e052f46 100644 --- a/mozilla/webtools/testopia/extensions/testopia/code/post_bug-after_creation.pl +++ b/mozilla/webtools/testopia/extensions/testopia/code/post_bug-after_creation.pl @@ -6,16 +6,20 @@ use Bugzilla::Testopia::TestCase; my $vars = Bugzilla->hook_args->{vars}; my $cgi = Bugzilla->cgi; -if ($cgi->param('case_id')) { +my $caserun_id = $cgi->param('caserun_id'); +my $case_id = $cgi->param('case_id'); +if (detaint_natural($case_id)) { my $case = Bugzilla::Testopia::TestCase->new($cgi->param('case_id')); + ThrowUserError("invalid-test-id-non-existent", {'id' => $case_id, 'type' => 'Case'}) unless $case; ThrowUserError("testopia-read-only", {'object' => $case}) unless $case->canedit; $case->attach_bug($vars->{'id'}); $vars->{'case'} = $case; } -if ($cgi->param('caserun_id')) { +if (detaint_natural($caserun_id)) { my $caserun = Bugzilla::Testopia::TestCaseRun->new($cgi->param('caserun_id')); + ThrowUserError("invalid-test-id-non-existent", {'id' => $caserun_id, 'type' => 'Case-Run'}) unless $caserun; ThrowUserError("testopia-read-only", {'object' => $caserun}) unless $caserun->canedit; $caserun->attach_bug($vars->{'id'}); diff --git a/mozilla/webtools/testopia/template/en/default/hook/global/common-links.html.tmpl/links/testopia.html.tmpl b/mozilla/webtools/testopia/template/en/default/hook/global/common-links.html.tmpl/links/testopia.html.tmpl index 88d0b57186b..2c17d7c1539 100644 --- a/mozilla/webtools/testopia/template/en/default/hook/global/common-links.html.tmpl/links/testopia.html.tmpl +++ b/mozilla/webtools/testopia/template/en/default/hook/global/common-links.html.tmpl/links/testopia.html.tmpl @@ -41,10 +41,10 @@
  • diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl index 387b9e0c45d..23511cae202 100644 --- a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl +++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl @@ -24,7 +24,7 @@ [% title = "Bug Impact Report for Plan $plan.id - $plan.name" %] [% PROCESS global/header.html.tmpl - style_urls = ['testopia.css'] %] + %]

    This report details the bugs detected in this test plan and the number of test cases that each bug is attached to. Those bugs impacting the most test cases appear at the top. diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl index f63f3e34e2d..f12acdbfe82 100644 --- a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl +++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl @@ -35,7 +35,7 @@ [%############################################################################%] [% PROCESS global/header.html.tmpl - style_urls = ['testopia.css'] + title = title style = style %] diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl index e59305f21d1..d579f8621dc 100644 --- a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl +++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl @@ -35,7 +35,7 @@ [%############################################################################%] [% PROCESS global/header.html.tmpl - style_urls = ['testopia.css'] + title = title style = style %] diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl index 87f3ed0d810..a84e9ef3a1f 100644 --- a/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl +++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl @@ -35,7 +35,7 @@ [%############################################################################%] [% PROCESS global/header.html.tmpl - style_urls = ['testopia.css'] %] + %] [% PROCESS testopia/style.none.tmpl %]

    Summary of all runs

    diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl index d857c718ef5..037007689f8 100644 --- a/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl +++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl @@ -35,7 +35,7 @@ [%############################################################################%] [% PROCESS global/header.html.tmpl - style_urls = ['testopia.css'] + title = title style = style %] diff --git a/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl index c7f02a6ce1d..e870fc1bb99 100644 --- a/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl +++ b/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl @@ -23,7 +23,7 @@ [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl - style_urls = ['testopia.css'] + title = "Search by Test Run Number" %] diff --git a/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl index 0e1baac4a5f..230500e4233 100644 --- a/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl +++ b/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl @@ -20,7 +20,7 @@ [% PROCESS global/header.html.tmpl - style_urls = ['testopia.css'] + title = "Tags" %] [% PROCESS testopia/messages.html.tmpl %] [% PROCESS testopia/blocks.html.tmpl %] diff --git a/mozilla/webtools/testopia/testopia/js/case.js b/mozilla/webtools/testopia/testopia/js/case.js index 93fe895e954..53cd503de75 100644 --- a/mozilla/webtools/testopia/testopia/js/case.js +++ b/mozilla/webtools/testopia/testopia/js/case.js @@ -902,10 +902,16 @@ NewCaseForm = function(plan_ids, product_id, run_id){ } },{ text: 'Cancel', + id: 'ncf_cancel_btn', handler: function(){ Ext.getCmp('newcaseform').getForm().reset(); try { - Ext.getCmp('newcase-win').close(); + if (Ext.getCmp('newcase-win')) { + Ext.getCmp('newcase-win').close(); + } + else{ + window.location = 'tr_show_product.cgi'; + } } catch (err){} } @@ -1205,7 +1211,12 @@ CaseClonePanel = function(product_id, cases){ },{ text: 'Cancel', handler: function(){ - Ext.getCmp('case-clone-win').close(); + try { + Ext.getCmp('case-clone-win').close(); + } + catch (err){ + window.location = 'tr_show_product.cgi'; + } } }] }); diff --git a/mozilla/webtools/testopia/testopia/js/caserun.js b/mozilla/webtools/testopia/testopia/js/caserun.js index a8f7c1696df..6045446b1bc 100755 --- a/mozilla/webtools/testopia/testopia/js/caserun.js +++ b/mozilla/webtools/testopia/testopia/js/caserun.js @@ -125,6 +125,7 @@ CaseRunFilter = function (){ var ds = Ext.getCmp('caserun_grid').store; ds.baseParams = searchform.getValues(); ds.baseParams.limit = Ext.getCmp('testopia_pager').pageSize; + ds.baseParams.distinct = 1; ds.load({ callback: function(){ Ext.getCmp('filtered_txt').show(); diff --git a/mozilla/webtools/testopia/testopia/js/run.js b/mozilla/webtools/testopia/testopia/js/run.js index 49b1b5f29b0..8f892790c81 100644 --- a/mozilla/webtools/testopia/testopia/js/run.js +++ b/mozilla/webtools/testopia/testopia/js/run.js @@ -655,10 +655,6 @@ var NewRunForm = function(plan){ if (Ext.getCmp('plan_run_grid')){ Ext.getCmp('plan_run_grid').store.reload(); } - try { - Ext.getCmp('newRun-win').close(); - } - catch (err){} }, failure: testopiaError }); @@ -666,12 +662,15 @@ var NewRunForm = function(plan){ },{ text: 'Cancel', type: 'reset', + id: 'nrf_cancel_btn', handler: function(){ Ext.getCmp('newrunsouth').getForm().reset(); try { Ext.getCmp('newRun-win').close(); } - catch (err){} + catch (err){ + window.location = 'tr_show_product.cgi'; + } } }] }); diff --git a/mozilla/webtools/testopia/testopia/js/util.js b/mozilla/webtools/testopia/testopia/js/util.js index 3c179dfa4c0..fa25c273222 100755 --- a/mozilla/webtools/testopia/testopia/js/util.js +++ b/mozilla/webtools/testopia/testopia/js/util.js @@ -956,7 +956,8 @@ DocCompareToolbar = function(object, id){ var foo = Ext.getCmp('doc_view').getValue(); var tab = Ext.getCmp('object_panel').add({ title: 'Version ' + Ext.getCmp('doc_view').getValue(), - closable: true + closable: true, + autoScroll: true }); tab.show(); tab.load({