Attachment 314522 Details for Bug 224305 – Patch Improve.

[patch] Patch Improve.

msg.patch (text/plain), 6.10 KB, created by XINSUN on 2008-08-19 09:25:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: XINSUN

Created: 2008-08-19 09:25:52 UTC

Size: 6.10 KB

patch

obsolete

>Index: hwcert.pl
>===================================================================
>RCS file: /cvs/qa/hwcert/hwcert.pl,v
>retrieving revision 1.57
>diff -u -r1.57 hwcert.pl
>--- hwcert.pl	30 Jul 2008 17:50:59 -0000	1.57
>+++ hwcert.pl	19 Aug 2008 09:17:22 -0000
>@@ -1428,6 +1428,17 @@
>     return 1;
> }
> 
>+sub GetTestplanItemMissingClass {
>+    my $cid = shift @_;
>+    my $query = "SELECT description FROM testplan_desc where name = 'undefined' and (required_32bits = 1 or required_64bits = 1) and cert_id = $cid";
>+    SendSQL2($query);
>+    my @description = ();
>+    while (MoreSQLData2()) {
>+        push(@description, FetchOneColumn2());
>+    }
>+    return \@description;
>+}
>+
> sub GenerateTestplan {
>     my ( $area, $cid, $user_id ) = @_;
>     my $eachline;
>@@ -1496,9 +1507,6 @@
> 
>         if ( $eachline =~ m/--=ADDITIONAL TEST PLAN LINES=--/ || 
> 	   $eachline =~ m/^\s+$/ ) { next };
>-        if ( length($eachline) > 150 ) {
>-                ThrowUserError("Parse failure");
>-        }
> 
>         my $testplan_class;
>         my $testplan_description;
>Index: process.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/process.cgi,v
>retrieving revision 1.36
>diff -u -r1.36 process.cgi
>--- process.cgi	31 Jul 2008 20:10:35 -0000	1.36
>+++ process.cgi	19 Aug 2008 09:17:22 -0000
>@@ -2229,13 +2229,6 @@
>             trick_taint($area);
>             $area =~ s/\r//g;
>             $area = trim($area);
>-            my $eachline;
>-            foreach $eachline( split(/\n/,$area) ) {
>-                trick_taint($eachline);
>-                if ( length($eachline) > 150 ) {
>-                    ThrowUserError("Parse failure");
>-                }
>-            }
>         }
>         trick_taint($flag);
> 
>@@ -2471,7 +2464,8 @@
>                     ThrowUserError("hwcert_group_access_denied",{action =>"changing status"});
>                 }
>                 if ( $flag eq "Frozen" && ! IsTestplanClassAllSelect($cid) ) { 
>-                    ThrowUserError("Missing Test Plan Class");
>+                    my @testplan_missingclass_desclist = GetTestplanItemMissingClass($cid);
>+                    ThrowUserError("missing_testplan_class",{testplan_missingclass_desclist => @testplan_missingclass_desclist});
>                 }
>                 UpdateTestplanStatus( $cid, $flag, $whoid );
>             }
>@@ -2493,7 +2487,7 @@
>         #Add a new testplan record
>         if ( $cgi->param('add_testplan') ) {
>             if ( $data_flag eq "Frozen" && $flag eq "Frozen") {
>-            ThrowUserError("Testplan_freeze_error"); }
>+            ThrowUserError("add_new_testplan_item_error"); }
>             AddNewTestplanItem($cgi->param('add_testplan'), $cid, $whoid, $cgi->param("testplan_with_class"));
>         }
>     }
>Index: template/en/default/global/user-error.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/global/user-error.html.tmpl,v
>retrieving revision 1.20
>diff -u -r1.20 user-error.html.tmpl
>--- template/en/default/global/user-error.html.tmpl	31 Jul 2008 20:10:36 -0000	1.20
>+++ template/en/default/global/user-error.html.tmpl	19 Aug 2008 09:17:22 -0000
>@@ -449,37 +449,29 @@
>     Test results not found: Data can only be parsed from hts test result packages.
> 
>   [% ELSIF error == "hwcert_group_access_denied" %]
>-    [% title = "Access Denied" %]
>-    Only member of hwcert_edit group can do "[% action FILTER html %]".
>-  
>-  [% ELSIF error == "hwcert_edit_denied" %]
>-    [% title = "Access Denied" %]
>-    Testplan status is currently frozen, you are not allowed to modify.
>+    [% title = "Permission Denied" %]
>+    You do not have permission to [% action FILTER html %].
>   
>-  [% ELSIF error == "Testplan_freeze_error" %]
>-    [% title = "Testplan status error" %]
>-    Testplan status is currently frozen, you are not allowed to add a new item or change removed flag...
>+  [% ELSIF error == "add_new_testplan_item_error" %]
>+    [% title = "Add New Testplan Item Error" %]
>+    Testplan status is frozen currently, you are not allowed to add a new testplan item.
>  
>   [% ELSIF error == "Testplan_leverage_format_error" %]
>-    [% title = "Testplan leverage format error" %]
>-    Make sure Leverage Bug Id is numeric.
>+    [% title = "Testplan Leverage Format Error" %]
>+    Make sure Leverage Id is numeric.
> 
>   [% ELSIF error == "Test_does_not_exist" %]
>-    [% title = "Test ID not Found" %]
>-    Test ID [% test_id FILTER html %] was not found, please press back and select a valid Test ID.
>+    [% title = "Test ID Not Found" %]
>+    Test ID [% test_id FILTER html %] was not found, please press back and enter a valid Test ID.
> 
>   [% ELSIF error == "Test_ID_is_in_this_certification" %]
>-    [% title = "Test ID is local" %]
>+    [% title = "Test ID Is Local" %]
>     Test ID [% test_id %] is local to certification [% cert_id %] and cannot be used in leverage in the certification [% cert_id %]
> 
>   [% ELSIF error == "Create_certification_conflict_error" %]
>-    [% title = "Create conflict error" %]
>+    [% title = "Create Conflict Error" %]
>     You can not specify Make and Model while there is a result rpm.
> 
>-  [% ELSIF error == "Parse failure" %]
>-    [% title = "Parse failure" %]
>-    Test plan line greater than 150 characters.
>-
>   [% ELSIF error == "keyword_already_exists" %]
>     [% title = "Keyword Already Exists" %]
>     A keyword with the name [% name FILTER html %] already exists.
>@@ -899,9 +891,13 @@
>     [% title = "Illegal Make" %]
>     Make has been defined as UnknownMake; please configure field:Make before continuing.
>     
>-  [% ELSIF error == "Missing Test Plan Class" %]
>-    [% title = "Missing Test Plan Class" %]
>-    You must select a class for each test plan item; please select the class in the Test Plan Progress section.
>+  [% ELSIF error == "missing_testplan_class" %]
>+    [% title = "Missing Class" %]
>+    The test plan could not be frozen because the follow line items do not have
>+classes defined:<br>
>+    [% FOREACH description = testplan_missingclass_desclist %]
>+      "[% description FILTER html %]"<br>
>+    [% END %]
> 
>   [% ELSIF error == "md5sum_override_permission_deny"%]
>     [% title = "Md5sum Override Permission Deny" %]

Actions: View | Diff

Attachments on bug 224305: 313905 | 314389 | 314522