zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

checkbox galleryAppsAlwaysIgnoreDependencies

Browse source
This commit is contained in:
Sergey 2012-09-24 16:25:59 +03:00
parent 80652eb959
commit 34e566e7d1
9 changed files with 59 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebAppGallery/WebAppGalleryController.cs
View file

@ -487,6 +487,19 @@ namespace WebsitePanel.EnterpriseServer
|| context.Groups.ContainsKey(ResourceGroups.MySql5))) || context.Groups.ContainsKey(ResourceGroups.MySql5)))
result.ErrorCodes.Add(GalleryErrors.MySQLRequired); result.ErrorCodes.Add(GalleryErrors.MySQLRequired);
//show Dependency warning optionaly
int serviceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.Web);
StringDictionary serviceSettings = ServerController.GetServiceSettings(serviceId);
bool galleryAppsAlwaysIgnoreDependencies = Utils.ParseBool(serviceSettings["GalleryAppsAlwaysIgnoreDependencies"], false);
if (galleryAppsAlwaysIgnoreDependencies)
{
result.ErrorCodes.Clear();
}
if (result.ErrorCodes.Count > 0) if (result.ErrorCodes.Count > 0)
{ {
GalleryApplicationResult warning = Warning<GalleryApplicationResult>(result, GalleryErrors.PackageDoesNotMeetRequirements); GalleryApplicationResult warning = Warning<GalleryApplicationResult>(result, GalleryErrors.PackageDoesNotMeetRequirements);

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/IIS60_Settings.ascx.resx
View file

@ -123,9 +123,13 @@
<data name="FilterDialogButton.AlternateText" xml:space="preserve"> <data name="FilterDialogButton.AlternateText" xml:space="preserve">
<value>Click to modify the filter...</value> <value>Click to modify the filter...</value>
</data> </data>
<data name="chkGalleryAppsAlwaysIgnoreDependencies.Text" xml:space="preserve">
<value>Always ignore dependencies</value>
</data>
<data name="FilterDialogButton.Text" xml:space="preserve"> <data name="FilterDialogButton.Text" xml:space="preserve">
<value>Click to create a filter...</value> <value>Click to create a filter...</value>
</data> </data>
<data name="GalleryFeedFilter.Text" xml:space="preserve"> <data name="GalleryFeedFilter.Text" xml:space="preserve">
<value>Gallery feed filter:</value> <value>Gallery feed filter:</value>
</data> </data>

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/IIS70_Settings.ascx.resx
View file

@ -219,6 +219,9 @@
<data name="FilterDialogButton.Text" xml:space="preserve"> <data name="FilterDialogButton.Text" xml:space="preserve">
<value>Click to create a filter...</value> <value>Click to create a filter...</value>
</data> </data>
<data name="chkGalleryAppsAlwaysIgnoreDependencies.Text" xml:space="preserve">
<value>Always ignore dependencies</value>
</data>
<data name="GalleryFeedFilter.Text" xml:space="preserve"> <data name="GalleryFeedFilter.Text" xml:space="preserve">
<value>Gallery feed filter:</value> <value>Gallery feed filter:</value>
</data> </data>

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS60_Settings.ascx
View file

@ -135,6 +135,11 @@
<asp:LinkButton runat="server" ID="FilterDialogButton" meta:resourcekey="FilterDialogButton" Text="Click to apply a filter..." /> <asp:LinkButton runat="server" ID="FilterDialogButton" meta:resourcekey="FilterDialogButton" Text="Click to apply a filter..." />
</td> </td>
</tr> </tr>
<tr>
<td colspan="2">
<asp:CheckBox ID="chkGalleryAppsAlwaysIgnoreDependencies" runat="server" meta:resourcekey="chkGalleryAppsAlwaysIgnoreDependencies" Text="Always ignore dependencies" />
</td>
</tr>
</table> </table>
</fieldset> </fieldset>
<br /> <br />

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS60_Settings.ascx.cs
View file

@ -132,6 +132,7 @@ namespace WebsitePanel.Portal.ProviderControls
ActiveDirectoryIntegration.BindSettings(settings); ActiveDirectoryIntegration.BindSettings(settings);
// //
FilteredAppIds = settings["GalleryAppsFilter"]; FilteredAppIds = settings["GalleryAppsFilter"];
chkGalleryAppsAlwaysIgnoreDependencies.Checked = Utils.ParseBool(settings["GalleryAppsAlwaysIgnoreDependencies"], false);
} }
public void SaveSettings(StringDictionary settings) public void SaveSettings(StringDictionary settings)
@ -166,6 +167,7 @@ namespace WebsitePanel.Portal.ProviderControls
ActiveDirectoryIntegration.SaveSettings(settings); ActiveDirectoryIntegration.SaveSettings(settings);
// //
settings["GalleryAppsFilter"] = GetAppsCatalogFilter(); settings["GalleryAppsFilter"] = GetAppsCatalogFilter();
settings["GalleryAppsAlwaysIgnoreDependencies"] = chkGalleryAppsAlwaysIgnoreDependencies.Checked.ToString();
} }
} }
} }

9
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS60_Settings.ascx.designer.cs generated
View file

@ -255,6 +255,15 @@ namespace WebsitePanel.Portal.ProviderControls {
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.LinkButton FilterDialogButton; protected global::System.Web.UI.WebControls.LinkButton FilterDialogButton;
/// <summary>
/// chkGalleryAppsAlwaysIgnoreDependencies control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkGalleryAppsAlwaysIgnoreDependencies;
/// <summary> /// <summary>
/// FilterDialogPanel control. /// FilterDialogPanel control.
/// </summary> /// </summary>

10
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx
View file

@ -214,9 +214,19 @@
</tr> </tr>
--%> --%>
</table> </table>
<uc6:EditFeedsList ID="wpiEditFeedsList" runat="server" DisplayNames="false" /> <uc6:EditFeedsList ID="wpiEditFeedsList" runat="server" DisplayNames="false" />
<br/>
<asp:CheckBox ID="chkGalleryAppsAlwaysIgnoreDependencies" runat="server" meta:resourcekey="chkGalleryAppsAlwaysIgnoreDependencies" Text="Always ignore dependencies" />
</fieldset> </fieldset>
<br /> <br />
<asp:Panel ID="FilterDialogPanel" runat="server" CssClass="PopupContainer" style="display:none" <asp:Panel ID="FilterDialogPanel" runat="server" CssClass="PopupContainer" style="display:none"

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs
View file

@ -200,6 +200,8 @@ namespace WebsitePanel.Portal.ProviderControls
WDeployDisabledCheckBox.Checked = true; WDeployDisabledCheckBox.Checked = true;
} }
} }
chkGalleryAppsAlwaysIgnoreDependencies.Checked = Utils.ParseBool(settings["GalleryAppsAlwaysIgnoreDependencies"], false);
} }
public void SaveSettings(StringDictionary settings) public void SaveSettings(StringDictionary settings)
@ -269,6 +271,8 @@ namespace WebsitePanel.Portal.ProviderControls
{ {
settings[WDeployEnabled] = Boolean.FalseString; settings[WDeployEnabled] = Boolean.FalseString;
} }
settings["GalleryAppsAlwaysIgnoreDependencies"] = chkGalleryAppsAlwaysIgnoreDependencies.Checked.ToString();
} }
protected void DownladAndIstallApeLinkButton_Click(object sender, EventArgs e) protected void DownladAndIstallApeLinkButton_Click(object sender, EventArgs e)

9
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.designer.cs generated
View file

@ -337,6 +337,15 @@ namespace WebsitePanel.Portal.ProviderControls {
/// </remarks> /// </remarks>
protected global::WebsitePanel.Portal.UserControls.EditFeedsList wpiEditFeedsList; protected global::WebsitePanel.Portal.UserControls.EditFeedsList wpiEditFeedsList;
/// <summary>
/// chkGalleryAppsAlwaysIgnoreDependencies control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkGalleryAppsAlwaysIgnoreDependencies;
/// <summary> /// <summary>
/// FilterDialogPanel control. /// FilterDialogPanel control.
/// </summary> /// </summary>