From fac0d8c9d9080e6f097b3773c969a0e4f9aa04cc Mon Sep 17 00:00:00 2001 From: dev_amdtel Date: Tue, 7 May 2013 12:22:46 +0400 Subject: [PATCH] Fixed dialogue "Web Site Properties" and small correction of procedure "get/set status of the pool" --- .../Common/AppPoolState.cs | 8 +- .../WebObjects/WebObjectsModuleService.cs | 71 ++++++++++-------- .../App_Themes/Default/Buttons.skin | 1 + .../App_Themes/Default/Images/restart_24.png | Bin 0 -> 4151 bytes .../WebsitePanel/WebSitesEditSite.ascx | 35 ++++----- .../WebsitePanel/WebSitesEditSite.ascx.cs | 10 +-- .../WebSitesEditSite.ascx.designer.cs | 58 +++++++++----- 7 files changed, 106 insertions(+), 77 deletions(-) create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/restart_24.png diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/AppPoolState.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/AppPoolState.cs index 6327db0b..9532f906 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/AppPoolState.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/AppPoolState.cs @@ -6,8 +6,10 @@ namespace WebsitePanel.Providers public enum AppPoolState { Unknown = 0, - Start = 1, - Stop = 2, - Recycle = 3 + Starting = 1, + Started = 2, + Stopping = 3, + Stopped = 4, + Recycle = 5 } } diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs index 2bb975e4..21774080 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs @@ -351,9 +351,6 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects // AppPool public void ChangeAppPoolState(string siteId, AppPoolState state) { - // del - File.AppendAllText(@"c:\websitepanel\test.log", "ChangeAppPoolState " + siteId + " state " + state.ToString() + "\r\n"); - using (var srvman = GetServerManager()) { var site = srvman.Sites[siteId]; @@ -361,34 +358,44 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects if (site == null) return; - string AppPoolName = site.ApplicationDefaults.ApplicationPoolName; foreach (Application app in site.Applications) - AppPoolName = app.ApplicationPoolName; - - if (string.IsNullOrEmpty(AppPoolName)) - return; - - ApplicationPool pool = srvman.ApplicationPools[AppPoolName]; - if (pool == null) return; - - // - switch (state) { - case AppPoolState.Start: - pool.Start(); - pool.AutoStart = true; - break; - case AppPoolState.Stop: - pool.Stop(); - pool.AutoStart = false; - break; - case AppPoolState.Recycle: - pool.Recycle(); - pool.AutoStart = true; - break; + string AppPoolName = app.ApplicationPoolName; + + if (string.IsNullOrEmpty(AppPoolName)) + continue; + + ApplicationPool pool = srvman.ApplicationPools[AppPoolName]; + if (pool == null) continue; + + // + switch (state) + { + case AppPoolState.Started: + case AppPoolState.Starting: + if ((pool.State != ObjectState.Started) && (pool.State != ObjectState.Starting)) + { + pool.Start(); + pool.AutoStart = true; + } + break; + case AppPoolState.Stopped: + case AppPoolState.Stopping: + if ((pool.State != ObjectState.Stopped) && (pool.State != ObjectState.Stopping)) + { + pool.Stop(); + pool.AutoStart = false; + } + break; + case AppPoolState.Recycle: + pool.Recycle(); + pool.AutoStart = true; + break; + } + + srvman.CommitChanges(); + } - // - srvman.CommitChanges(); } } @@ -416,16 +423,16 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects switch (pool.State) { case ObjectState.Started: - state = AppPoolState.Start; + state = AppPoolState.Started; break; case ObjectState.Starting: - state = AppPoolState.Start; + state = AppPoolState.Starting; break; case ObjectState.Stopped: - state = AppPoolState.Stop; + state = AppPoolState.Stopped; break; case ObjectState.Stopping: - state = AppPoolState.Stop; + state = AppPoolState.Stopping; break; } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin index d371a071..516cb229 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin @@ -31,6 +31,7 @@ Default skin template. The following skins are provided as examples only. + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/restart_24.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/restart_24.png new file mode 100644 index 0000000000000000000000000000000000000000..6e01faaba70b6e7e28ae7e96f1b48f8e1efbada2 GIT binary patch literal 4151 zcmV-75XkR|P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000GINkl%oJKJ0HCqj3@IvY^gRt);u0@BeQj2w3@?*yee8@2_86`{*~%&&Gs+phH8e&7|9m+qJqSEL=6o zi?d1kaxj{tezn_Nxaeyox9@(y%mkx6>7q2sUB|jmMq>;)kR)h|}s>y7xw{%G;W=HI{ihZ6KC8h{=>-0ptx@u;ehP(&2ESI0wJ z`EI-Qa&Pb1!AV+_i;ei^+RC++D@mv&fX(IhNje>Z_7onx-Cyfnp|k$+H21lQ5WI*0 zq6Y!MXXoQTZ|{7+e`K5O%j+Aq)7wkk*ROt@m$`_v;&`K38)sQ#^~(0c9gm)N_g=@H zg_2nW6%dGMR0s+Y;%2A4vJO!+ckUv~#!gNvzt>O2GmGoCn#2BJuFab_Z!Rt_^zlyz zCP_pD0G+T>L?ngtdCAiv1Ar_qtx>TxK`4agAj@wuD2&rkb0&vRT{ zVh|BgihAwVLd~2ErpKHP)5;@7p-!SWwnoHzz_cuYP>2Gfz?BwN1+GYQZ311D4uC|Q zM%rjKmYUHezW^Be5NCIW2RfzzKNIauPy|}pec9M~xR>TO4 zb*q^HWhsuA*W!xh--k!@`8*6GP{c|$S}mneD|LD@vet@op*Bf7p^dB8W|N`SR5)IU zj8PaZc0Dk|@T|PU$7-fIl+WF_>XK$wNyQA}>WFRE1lv1G$Vr#4oN!i2m;e)47 zXNB*qtsFku`SmBi48s_JvGPtc@4nvu>i+%l<#mq~S{<3FuH3te3#-j!q0tBeQSDCzZj`!AjZv+3ube+ED(fX+EU$Aag_=lAaaYu;HEZ8Sn)loD6vxyv&y zD`po(QLUCVn@Q_ZXaDKrcsBX{AAT2xu|o1F=qqOMM4H(h9UXrC?asK~DQk&Q+LAJg zloqRWpiO9uQmUGdCws4!ljQc@TXDTcV1Pl;qjSyyYVZIW!0qn7{^sFUu+W*s4Kk65 zB4dowMC>_BVLrP!+`qE4{Hx!7601;V*IR literal 0 HcmV?d00001 diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx index 9ba2b5ba..6b8e3074 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx @@ -166,18 +166,12 @@ + - - <%-- AppPool --%> - - <%-- AppPool --%> - - - - - <%-- AppPool --%> - + + + + - <%-- AppPool --%> -
+ + - App Pool : -
@@ -188,15 +182,22 @@ - Start
- Stop
- Recycle +
+ + + + + + +
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs index c7cf1c34..1ffd70b7 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs @@ -995,17 +995,17 @@ namespace WebsitePanel.Portal // AppPool private void BindAppPoolState(AppPoolState state) { - litAppPoolStatus.Text = state.ToString(); + litAppPoolStatus.Text = GetLocalizedString("SiteState." + state.ToString()); - cmdAppPoolStart.Visible = (state == AppPoolState.Stop); - cmdAppPoolStop.Visible = (state == AppPoolState.Start); - cmdAppPoolRecycle.Visible = (state == AppPoolState.Start); + cmdAppPoolStart.Visible = (state == AppPoolState.Stopped || state == AppPoolState.Stopping); + cmdAppPoolStop.Visible = (state == AppPoolState.Started || state == AppPoolState.Starting); + cmdAppPoolRecycle.Visible = (state == AppPoolState.Started || state == AppPoolState.Starting); } protected void cmdAppPoolChangeState_Click(object sender, EventArgs e) { - string stateName = ((LinkButton)sender).CommandName; + string stateName = ((ImageButton)sender).CommandName; AppPoolState state = (AppPoolState)Enum.Parse(typeof(AppPoolState), stateName, true); try diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.designer.cs index d9c6a188..86809b51 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.designer.cs @@ -318,6 +318,15 @@ namespace WebsitePanel.Portal { /// protected global::System.Web.UI.WebControls.GridView gvPointers; + /// + /// lblWebsiteStatus элемент управления. + /// + /// + /// Автоматически создаваемое поле. + /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части. + /// + protected global::System.Web.UI.WebControls.Label lblWebsiteStatus; + /// /// litStatus элемент управления. /// @@ -327,15 +336,6 @@ namespace WebsitePanel.Portal { /// protected global::System.Web.UI.WebControls.Literal litStatus; - /// - /// litAppPoolStatus элемент управления. - /// - /// - /// Автоматически создаваемое поле. - /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части. - /// - protected global::System.Web.UI.WebControls.Literal litAppPoolStatus; - /// /// cmdStart элемент управления. /// @@ -372,6 +372,24 @@ namespace WebsitePanel.Portal { /// protected global::System.Web.UI.WebControls.ImageButton cmdStop; + /// + /// lblAppPoolStatus элемент управления. + /// + /// + /// Автоматически создаваемое поле. + /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части. + /// + protected global::System.Web.UI.WebControls.Label lblAppPoolStatus; + + /// + /// litAppPoolStatus элемент управления. + /// + /// + /// Автоматически создаваемое поле. + /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части. + /// + protected global::System.Web.UI.WebControls.Literal litAppPoolStatus; + /// /// cmdAppPoolStart элемент управления. /// @@ -379,16 +397,7 @@ namespace WebsitePanel.Portal { /// Автоматически создаваемое поле. /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части. /// - protected global::System.Web.UI.WebControls.LinkButton cmdAppPoolStart; - - /// - /// cmdAppPoolStop элемент управления. - /// - /// - /// Автоматически создаваемое поле. - /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части. - /// - protected global::System.Web.UI.WebControls.LinkButton cmdAppPoolStop; + protected global::System.Web.UI.WebControls.ImageButton cmdAppPoolStart; /// /// cmdAppPoolRecycle элемент управления. @@ -397,7 +406,16 @@ namespace WebsitePanel.Portal { /// Автоматически создаваемое поле. /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части. /// - protected global::System.Web.UI.WebControls.LinkButton cmdAppPoolRecycle; + protected global::System.Web.UI.WebControls.ImageButton cmdAppPoolRecycle; + + /// + /// cmdAppPoolStop элемент управления. + /// + /// + /// Автоматически создаваемое поле. + /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части. + /// + protected global::System.Web.UI.WebControls.ImageButton cmdAppPoolStop; /// /// dlTabs элемент управления.