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

Merge

Browse source
This commit is contained in:
Christiaan Swiers 2015-01-15 16:29:22 +01:00
commit b338a67be9
2887 changed files with 61285 additions and 3964 deletions
Download patch file Download diff file Expand all files Collapse all files

25
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014, Outercurve Foundation.
// Copyright (c) 2015, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
@ -2685,6 +2685,17 @@ namespace WebsitePanel.EnterpriseServer
);
}
public static IDataReader GetExchangeAccountByAccountNameWithoutItemId(string primaryEmailAddress)
{
return SqlHelper.ExecuteReader(
ConnectionString,
CommandType.StoredProcedure,
"GetExchangeAccountByAccountNameWithoutItemId",
new SqlParameter("@PrimaryEmailAddress", primaryEmailAddress)
);
}
public static IDataReader GetExchangeMailboxes(int itemId)
{
return SqlHelper.ExecuteReader(
@ -4499,7 +4510,7 @@ namespace WebsitePanel.EnterpriseServer
);
}
public static int AddRDSCollection(int itemId, string name, string description)
public static int AddRDSCollection(int itemId, string name, string description, string displayName)
{
SqlParameter rdsCollectionId = new SqlParameter("@RDSCollectionID", SqlDbType.Int);
rdsCollectionId.Direction = ParameterDirection.Output;
@ -4511,7 +4522,8 @@ namespace WebsitePanel.EnterpriseServer
rdsCollectionId,
new SqlParameter("@ItemID", itemId),
new SqlParameter("@Name", name),
new SqlParameter("@Description", description)
new SqlParameter("@Description", description),
new SqlParameter("DisplayName", displayName)
);
// read identity
@ -4534,10 +4546,10 @@ namespace WebsitePanel.EnterpriseServer
public static void UpdateRDSCollection(RdsCollection collection)
{
UpdateRDSCollection(collection.Id, collection.ItemId, collection.Name, collection.Description);
UpdateRDSCollection(collection.Id, collection.ItemId, collection.Name, collection.Description, collection.DisplayName);
}
public static void UpdateRDSCollection(int id, int itemId, string name, string description)
public static void UpdateRDSCollection(int id, int itemId, string name, string description, string displayName)
{
SqlHelper.ExecuteNonQuery(
ConnectionString,
@ -4546,7 +4558,8 @@ namespace WebsitePanel.EnterpriseServer
new SqlParameter("@Id", id),
new SqlParameter("@ItemID", itemId),
new SqlParameter("@Name", name),
new SqlParameter("@Description", description)
new SqlParameter("@Description", description),
new SqlParameter("@DisplayName", displayName)
);
}

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/EcommerceProvider.cs
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014, Outercurve Foundation.
// Copyright (c) 2015, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
@ -2235,4 +2235,4 @@ namespace WebsitePanel.Ecommerce.EnterpriseServer
#endregion
}
}
}

6
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/SQLHelper.cs
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014, Outercurve Foundation.
// Copyright (c) 2015, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
@ -837,8 +837,8 @@ namespace Microsoft.ApplicationBlocks.Data
// Detach the SqlParameters from the command object, so they can be used again.
// HACK: There is a problem here, the output parameter values are fletched
// when the reader is closed, so if the parameters are detached from the command
// then the SqlReader can´t set its values.
// When this happen, the parameters can´t be used again in other command.
// then the SqlReader can<EFBFBD>t set its values.
// When this happen, the parameters can<EFBFBD>t be used again in other command.
bool canClear = true;
foreach(SqlParameter commandParameter in cmd.Parameters)
{