Author: mcalmer Date: Fri Oct 12 17:58:31 2007 New Revision: 41415 URL: http://svn.opensuse.org/viewcvs/yast?rev=41415&view=rev Log: add email for subject_alt_name in special cases Modified: trunk/ca-management/src/CaMgm.ycp trunk/ca-management/src/new_cert_callbacks.ycp trunk/ca-management/src/signRequest.ycp Modified: trunk/ca-management/src/CaMgm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/CaMgm.ycp?rev=41415&r1=41414&r2=41415&view=diff ============================================================================== --- trunk/ca-management/src/CaMgm.ycp (original) +++ trunk/ca-management/src/CaMgm.ycp Fri Oct 12 17:58:31 2007 @@ -135,6 +135,9 @@ global string prop_state = ""; global symbol prop_selection = `def; // `none, `disk + +global boolean adv_subject_alt_name_show_email = false; + /** * variables for new CA/Certificate/Request */ Modified: trunk/ca-management/src/new_cert_callbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/new_cert_callbacks.ycp?rev=41415&r1=41414&r2=41415&view=diff ============================================================================== --- trunk/ca-management/src/new_cert_callbacks.ycp (original) +++ trunk/ca-management/src/new_cert_callbacks.ycp Fri Oct 12 17:58:31 2007 @@ -701,6 +701,7 @@ `RadioButtonGroup(`id(`rb), `HBox( `RadioButton(`id("URI"), `opt(`notify), "URI", true), + `RadioButton(`id("email"), `opt(`notify), "email"), `RadioButton(`id("DNS"), `opt(`notify), "DNS"), `RadioButton(`id("IP"), `opt(`notify), "IP"), `RadioButton(`id("RID"), `opt(`notify), "RID"), @@ -726,6 +727,14 @@ subject_box ); UI::SetFocus (`id(`ok)); + if(!CaMgm::adv_subject_alt_name_show_email) + { + UI::ChangeWidget(`id("email"), `Enabled, false); + } + else + { + UI::ChangeWidget(`id("email"), `Enabled, true); + } while (true) { any ret = UI::UserInput(); Modified: trunk/ca-management/src/signRequest.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/signRequest.ycp?rev=41415&r1=41414&r2=41415&view=diff ============================================================================== --- trunk/ca-management/src/signRequest.ycp (original) +++ trunk/ca-management/src/signRequest.ycp Fri Oct 12 17:58:31 2007 @@ -670,8 +670,8 @@ string text = _("<p><b>Summary</b></p>"); text = text + "<br><pre>"; - text = text + "Subject: " + CaMgm::requestSubject; - text = text + "Valid Period: " + CaMgm::validPeriod + _(" days\n"); + text = text + "Subject: " + CaMgm::requestSubject + "\n"; + text = text + "Valid Period: " + CaMgm::validPeriod + _(" days") + "\n"; text = text + "<p>Basic Constaints: " + CaMgm::adv_ca + (CaMgm::adv_cri_ca ? _(" (critical)</p>") : "</p>") ; if (CaMgm::adv_pathlen) @@ -1063,9 +1063,14 @@ } else { + CaMgm::adv_subject_alt_name_show_email = false; Popup::Message(_("The request has been signed.")); } } + else if( ui == `edit) + { + CaMgm::adv_subject_alt_name_show_email = true; + } } until (contains ([`back, `next, `abort, `edit], ui)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org