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

merge commit

Browse source
This commit is contained in:
robvde 2013-03-04 18:36:15 +04:00
commit e3901f2440
7 changed files with 598 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs
View file

@ -1492,7 +1492,6 @@ namespace WebsitePanel.EnterpriseServer
private static bool AccountExists(string accountName, int ServiceId) private static bool AccountExists(string accountName, int ServiceId)
{ {
if (!DataProvider.ExchangeAccountExists(accountName)) if (!DataProvider.ExchangeAccountExists(accountName))
{ {
Organizations orgProxy = GetOrganizationProxy(ServiceId); Organizations orgProxy = GetOrganizationProxy(ServiceId);
@ -1503,6 +1502,7 @@ namespace WebsitePanel.EnterpriseServer
else else
return true; return true;
} }
public static int DeleteUser(int itemId, int accountId) public static int DeleteUser(int itemId, int accountId)

2
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/Scheduler.cs
View file

@ -162,7 +162,7 @@ namespace WebsitePanel.EnterpriseServer
counter++; counter++;
} }
{
// skip execution if the current task is still running // skip execution if the current task is still running
scheduledTasks = TaskManager.GetScheduledTasks(); scheduledTasks = TaskManager.GetScheduledTasks();
if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId)) if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))

28
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/SchedulerController.cs
View file

@ -86,21 +86,21 @@ namespace WebsitePanel.EnterpriseServer
{ {
DataSet ds = DataProvider.GetSchedule(SecurityContext.User.UserId, scheduleId); DataSet ds = DataProvider.GetSchedule(SecurityContext.User.UserId, scheduleId);
ScheduleInfo si = ObjectUtils.FillObjectFromDataView<ScheduleInfo>(ds.Tables[0].DefaultView); ScheduleInfo si = ObjectUtils.FillObjectFromDataView<ScheduleInfo>(ds.Tables[0].DefaultView);
return si; return si;
} }
/// <summary> /// <summary>
/// Gets view configuration for a certain task. /// Gets view configuration for a certain task.
/// </summary> /// </summary>
/// <param name="taskId">Task id for which view configuration is intended to be loeaded.</param> /// <param name="taskId">Task id for which view configuration is intended to be loeaded.</param>
/// <returns>View configuration for the task with supplied id.</returns> /// <returns>View configuration for the task with supplied id.</returns>
public static List<ScheduleTaskViewConfiguration> GetScheduleTaskViewConfigurations(string taskId) public static List<ScheduleTaskViewConfiguration> GetScheduleTaskViewConfigurations(string taskId)
{ {
List<ScheduleTaskViewConfiguration> c = ObjectUtils.CreateListFromDataReader<ScheduleTaskViewConfiguration>(DataProvider.GetScheduleTaskViewConfigurations(taskId)); List<ScheduleTaskViewConfiguration> c = ObjectUtils.CreateListFromDataReader<ScheduleTaskViewConfiguration>(DataProvider.GetScheduleTaskViewConfigurations(taskId));
return c; return c;
} }
internal static SchedulerJob GetScheduleComplete(int scheduleId) internal static SchedulerJob GetScheduleComplete(int scheduleId)
{ {
DataSet ds = DataProvider.GetSchedule(SecurityContext.User.UserId, scheduleId); DataSet ds = DataProvider.GetSchedule(SecurityContext.User.UserId, scheduleId);
return CreateCompleteScheduleFromDataSet(ds); return CreateCompleteScheduleFromDataSet(ds);
@ -199,7 +199,7 @@ namespace WebsitePanel.EnterpriseServer
nextStart = lastRun.AddSeconds(schedule.Interval); nextStart = lastRun.AddSeconds(schedule.Interval);
} }
if(nextStart < now) if (nextStart < now)
nextStart = now; // run immediately nextStart = now; // run immediately
// check if start time is in allowed interval // check if start time is in allowed interval
@ -261,7 +261,7 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// check quota // check quota
if(PackageController.GetPackageQuota(schedule.PackageId, Quotas.OS_SCHEDULEDTASKS).QuotaExhausted) if (PackageController.GetPackageQuota(schedule.PackageId, Quotas.OS_SCHEDULEDTASKS).QuotaExhausted)
return BusinessErrorCodes.ERROR_OS_SCHEDULED_TASK_QUOTA_LIMIT; return BusinessErrorCodes.ERROR_OS_SCHEDULED_TASK_QUOTA_LIMIT;
CalculateNextStartTime(schedule); CalculateNextStartTime(schedule);

2
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/SchedulerJob.cs
View file

@ -94,7 +94,7 @@ namespace WebsitePanel.EnterpriseServer
TaskManager.ItemId = scheduleInfo.ScheduleId; TaskManager.ItemId = scheduleInfo.ScheduleId;
TaskManager.ScheduleId = scheduleInfo.ScheduleId; TaskManager.ScheduleId = scheduleInfo.ScheduleId;
TaskManager.MaximumExecutionTime = scheduleInfo.MaxExecutionTime; TaskManager.MaximumExecutionTime = scheduleInfo.MaxExecutionTime;
// set task parameters // set task parameters
foreach (ScheduleTaskParameterInfo prm in scheduleInfo.Parameters) foreach (ScheduleTaskParameterInfo prm in scheduleInfo.Parameters)
TaskManager.TaskParameters[prm.ParameterId] = prm.ParameterValue; TaskManager.TaskParameters[prm.ParameterId] = prm.ParameterValue;

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

@ -71,7 +71,7 @@ namespace WebsitePanel.EnterpriseServer
private static string[] getFeedsFromSettingsByServiceId(int serviceId) private static string[] getFeedsFromSettingsByServiceId(int serviceId)
{ {
var wpiSettings = SystemController.GetSystemSettings(SystemSettings.WPI_SETTINGS); var wpiSettings = SystemController.GetSystemSettingsInternal(SystemSettings.WPI_SETTINGS,false);
List<string> feeds = new List<string>(); List<string> feeds = new List<string>();

1014
WebsitePanel/Sources/WebsitePanel.Server.Client/OrganizationProxy.cs
View file

File diff suppressed because it is too large Load diff

2
WebsitePanel/build.xml
View file

@ -3,7 +3,7 @@
<Version>2.1.0</Version> <Version>2.1.0</Version>
<FileVersion>$(BUILD_NUMBER)</FileVersion> <FileVersion>$(BUILD_NUMBER)</FileVersion>
<VersionLabel>$(BUILD_NUMBER)</VersionLabel> <VersionLabel>$(BUILD_NUMBER)</VersionLabel>
<ReleaseDate>2012-01-22</ReleaseDate> <ReleaseDate>2012-01-25</ReleaseDate>
<BuildConfiguration></BuildConfiguration> <BuildConfiguration></BuildConfiguration>
<RootFolder>..</RootFolder> <RootFolder>..</RootFolder>
<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder> <TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>