[yast-commit] r40403 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/HttpServerWidgets.ycp src/dialogs.ycp

Author: mzugec Date: Wed Aug 22 14:48:29 2007 New Revision: 40403 URL: http://svn.opensuse.org/viewcvs/yast?rev=40403&view=rev Log: don't forget values for vhost when go next-back (#299223) Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/HttpServerWidgets.ycp trunk/http-server/src/dialogs.ycp Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=40403&r1=40402&r2=40403&view=diff ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Wed Aug 22 14:48:29 2007 @@ -1 +1 @@ -2.15.6 +2.15.7 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-server.changes?rev=40403&r1=40402&r2=40403&view=diff ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Wed Aug 22 14:48:29 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 22 14:46:04 CEST 2007 - mzugec@suse.cz + +- don't forget values for vhost when go next-back (#299223) +- 2.15.7 + +------------------------------------------------------------------- Thu Jul 26 18:49:56 CEST 2007 - mzugec@suse.cz - save SSL section correctly (#294679) Modified: trunk/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidgets.ycp?rev=40403&r1=40402&r2=40403&view=diff ============================================================================== --- trunk/http-server/src/HttpServerWidgets.ycp (original) +++ trunk/http-server/src/HttpServerWidgets.ycp Wed Aug 22 14:48:29 2007 @@ -602,7 +602,7 @@ { init_tab = "hosts"; TablePopup::TableInit(hosts_widget, widget); - + vhost_descr = []; // menu button label UI::ReplaceWidget( `id(`_tp_table_repl), `PushButton( `id( `set_default ), _("Set as De&fault") ) ); @@ -964,6 +964,14 @@ global void initVhostRes(string key){ map vhost = YaST::HTTPDData::GetVhostType(currenthost); + if (vhost_descr!=[]){ + vhost=$[]; + foreach(map row, vhost_descr, { + if (row["KEY"]:""=="HostIP") vhost["id"] = row["VALUE"]:""; + if (row["KEY"]:""=="VirtualByName") vhost["type"] = (row["VALUE"]:"0"=="0")?"ip-based":"name-based"; + }); + } + if (vhost["type"]:""=="ip-based") UI::ChangeWidget(`resolution, `CurrentButton, `ip_based); else UI::ChangeWidget(`resolution, `CurrentButton, `name_based); UI::ChangeWidget(`virtual_host, `Value, vhost["id"]:""); Modified: trunk/http-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/dialogs.ycp?rev=40403&r1=40402&r2=40403&view=diff ============================================================================== --- trunk/http-server/src/dialogs.ycp (original) +++ trunk/http-server/src/dialogs.ycp Wed Aug 22 14:48:29 2007 @@ -128,8 +128,8 @@ string help = CWM::MergeHelps(w); contents = CWM::PrepareDialog(contents, w); - Wizard::SetContentsButtons(caption, contents, help, Label::NextButton (), Label::FinishButton ()); - Wizard::HideBackButton(); + Wizard::SetContentsButtons(caption, contents, help, Label::BackButton (), Label::FinishButton ()); + Wizard::DisableBackButton(); symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org