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

Merge

Browse source
This commit is contained in:
feodor_fitsner 2012-08-14 16:09:05 -07:00
commit 7891cc2cb1
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
View file

@ -109,6 +109,15 @@ namespace WebsitePanel.EnterpriseServer
delegate(ServiceProviderItem item) { return (Organization)item; }));
}
public static List<Organization> GetExchangeOrganizationsInternal(int packageId, bool recursive)
{
List<ServiceProviderItem> items = PackageController.GetPackageItemsByTypeInternal(packageId, null, typeof(Organization), recursive);
return items.ConvertAll<Organization>(
new Converter<ServiceProviderItem, Organization>(
delegate(ServiceProviderItem item) { return (Organization)item; }));
}
public static Organization GetOrganization(int itemId)
{
#region Demo Mode
@ -2554,12 +2563,12 @@ namespace WebsitePanel.EnterpriseServer
if ((Packages != null) & (Packages.Count > 0))
{
orgs = GetExchangeOrganizations(Packages[0].PackageId, false);
orgs = GetExchangeOrganizationsInternal(Packages[0].PackageId, false);
}
}
else
{
orgs = GetExchangeOrganizations(1, false);
orgs = GetExchangeOrganizationsInternal(1, false);
}
if ((orgs != null) &(orgs.Count > 0))

8
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs
View file

@ -1072,6 +1072,14 @@ namespace WebsitePanel.EnterpriseServer
return CreateServiceItemsList(dsItems, 0);
}
public static List<ServiceProviderItem> GetPackageItemsByTypeInternal(int packageId, string groupName, Type itemType, bool recursive)
{
string typeName = ObjectUtils.GetTypeFullName(itemType);
DataSet dsItems = DataProvider.GetServiceItems(-1, packageId, groupName, typeName, recursive);
return CreateServiceItemsList(dsItems, 0);
}
public static DataSet GetRawPackageItemsByType(int packageId, Type itemType, bool recursive)
{
return GetRawPackageItemsByType(packageId, null, itemType, recursive);

4
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config
View file

@ -65,7 +65,7 @@
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="UserSpaces" title="UserSpaces" icon="sphere_48.png" readOnlyRoles="PlatformHelpdesk,ResellerHelpdesk,User" />
<Module moduleDefinitionID="UserSpaces" title="UserSpaces" icon="sphere_48.png" readOnlyRoles="PlatformHelpdesk,ResellerHelpdesk" />
</Content>
</Page>
@ -175,7 +175,7 @@
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="Domains" title="Domains" icon="world_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User"/>
<Module moduleDefinitionID="Domains" title="Domains" icon="world_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
</Content>
</Page>