Author: mcalmer Date: Mon Jul 9 11:27:46 2007 New Revision: 39243 URL: http://svn.opensuse.org/viewcvs/yast?rev=39243&view=rev Log: fix always disabled Export Button [#231434] Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm branches/SuSE-SLE-10-SP2-Branch/ca-management/src/ca_select_proposal.ycp branches/SuSE-SLE-10-SP2-Branch/ca-management/src/certificate.ycp branches/SuSE-SLE-10-SP2-Branch/ca-management/src/new_cert.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm?rev=39243&r1=39242&r2=39243&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm Mon Jul 9 11:27:46 2007 @@ -2565,18 +2565,7 @@ { if(lc($map->iterator_key($mapIT)) eq "status") { - if(lc($map->iterator_value($mapIT)) eq "valid") - { - $hash->{status} = __("Valid"); - } - elsif(lc($map->iterator_value($mapIT)) eq "revoked") - { - $hash->{status} = __("Revoked"); - } - else # expired - { - $hash->{status} = __("Expired"); - } + $hash->{status} = lc($map->iterator_value($mapIT)); } else { Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/src/ca_select_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-management/src/ca_select_proposal.ycp?rev=39243&r1=39242&r2=39243&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/src/ca_select_proposal.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/src/ca_select_proposal.ycp Mon Jul 9 11:27:46 2007 @@ -114,7 +114,7 @@ UI::ChangeWidget(`id(`id_organisationUnit), `ValidChars, valid_chars); UI::ChangeWidget(`id(`id_locality), `ValidChars, valid_chars); UI::ChangeWidget(`id(`id_state), `ValidChars, valid_chars); -y2milestone(valid_chars); + y2milestone("%1", valid_chars); UI::ChangeWidget(`id(`id_CAName), `ValidChars, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-"); // Get the user input. Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/src/certificate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-management/src/certificate.ycp?rev=39243&r1=39242&r2=39243&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/src/certificate.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/src/certificate.ycp Mon Jul 9 11:27:46 2007 @@ -279,7 +279,19 @@ foreach (map element, ret, ``{ - result = add (result, `item (`id (i), element["status"]:"", + // Certificate status displayed in a table (Valid, Revoked, Expired) + string st = _("Valid"); + if(element["status"]:"" == "revoked") + { + // Certificate status displayed in a table (Valid, Revoked, Expired) + st = _("Revoked"); + } + if(element["status"]:"" == "expired") + { + // Certificate status displayed in a table (Valid, Revoked, Expired) + st = _("Expired"); + } + result = add (result, `item (`id (i), st, element["commonName"]:"", element["emailAddress"]:"", element["organizationName"]:"", @@ -380,7 +392,7 @@ UI::ChangeWidget( `id(`textinfo), `Value, getCertDescription (ret)); term table_item = (term) UI::QueryWidget(`id(`table), `Item(id)); - boolean valid = ((string) table_item[1]:"") == "Valid"; + boolean valid = ((string) table_item[1]:"") == _("Valid"); UI::ChangeWidget (`id (`delete), `Enabled, !valid); UI::ChangeWidget (`id (`revoke), `Enabled, valid); // do not export certificates which are a CA or revoked certificate Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/src/new_cert.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-management/src/new_cert.ycp?rev=39243&r1=39242&r2=39243&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/src/new_cert.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/src/new_cert.ycp Mon Jul 9 11:27:46 2007 @@ -160,7 +160,7 @@ UI::ChangeWidget(`id(`id_organisationUnit), `ValidChars, valid_chars); UI::ChangeWidget(`id(`id_locality), `ValidChars, valid_chars); UI::ChangeWidget(`id(`id_state), `ValidChars, valid_chars); -y2milestone(valid_chars); + y2milestone("%1", valid_chars); UI::ChangeWidget(`id(`id_CAName), `ValidChars, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-"); UI::SetFocus(`id(`id_CAName)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org