Context Navigation

← Previous Change
Next Change →

HeuristicLab.Clients.Hive.Administrator

Timestamp:

09/11/19 14:06:25 (5 years ago)

Author:

gkronber

Message:

#2925: merged r17037:17242 from trunk to branch

Location:

branches/2925_AutoDiffForDynamicalModels

Files:

: 28 edited

. (modified) (1 prop)
HeuristicLab.Clients.Hive.Administrator (modified) (1 prop)
HeuristicLab.Clients.Hive.Administrator/3.3/HiveDowntime.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/MenuItems/AdministratorMenuItem.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Clients.Hive.Administrator/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.Clients.Hive.Administrator/3.3/RecurrentEvent.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs (modified) (4 diffs)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourceView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2925_AutoDiffForDynamicalModels

Property svn:mergeinfo changed

/branches/2435-alglib_3_15 (added)	merged: 16683-16684,17034,17036
/trunk	merged: 17037,17043-17044,17048,17052,17076-17089,17092-17095,17110,17118,17121,17125-17128,17132,17137,17139,17150,17154,17179-17180,17182-17185,17191,17198,17220-17223,17242

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator
- Property svn:mergeinfo changed
  /branches/2435-alglib_3_15/HeuristicLab.Clients.Hive.Administrator (added) merged: 17034
  /trunk/HeuristicLab.Clients.Hive.Administrator merged: 17037,17180,17184,17223

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/HiveDowntime.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/MenuItems/AdministratorMenuItem.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Plugin.cs.frame

-                      r16662
+                      r17246
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.Clients.Hive.Administration {
   [Plugin("HeuristicLab.Clients.Hive.Administrator", "3.3.15.$WCREV$")]
+  [Plugin("HeuristicLab.Clients.Hive.Administrator", "3.3.16.$WCREV$")]
   [PluginFile("HeuristicLab.Clients.Hive.Administrator-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Clients.Access", "3.3")]

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Properties/AssemblyInfo.cs.frame

-                      r16662
+                      r17246
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("HEAL")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
+[assembly: AssemblyCopyright("(c) HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.15.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.16.$WCREV$")]

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/RecurrentEvent.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.Designer.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.Designer.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.Designer.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.Designer.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.cs

r16892	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs

-                      r16662
+                      r17246
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
         descriptionTextBox.Text = Content.Description;
-        ownerComboBox.SelectedIndexChanged -= ownerComboBox_SelectedIndexChanged;
         if (AccessClient.Instance.UsersAndGroups != null) {
           var users = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>();
 …
           ownerComboBox.SelectedItem = users.FirstOrDefault(x => x.Id == projectOwnerId);
+        }
-        ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged;
         createdTextBox.Text = Content.DateCreated.ToString("ddd, dd.MM.yyyy, HH:mm:ss");
 …
           var users = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>();
           if (Content != null && !Content.ParentProjectId.HasValue) users = users.Where(x => x.Roles.Select(y => y.Name).Contains(HiveRoles.Administrator));
+          var projectOwnerId = Content != null ? Content.OwnerUserId : (Guid?)null;
           ownerComboBox.DataSource = users.OrderBy(x => x.UserName).ToList();
+          ownerComboBox.SelectedItem = projectOwnerId.HasValue ? users.FirstOrDefault(x => x.Id == projectOwnerId) : null;
           ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged;
         });

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourceView.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.Designer.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.Designer.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.Designer.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.cs

r16662	r17246
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

Note: See TracChangeset for help on using the changeset viewer.

/branches/2435-alglib_3_15/HeuristicLab.Clients.Hive.Administrator (added)	merged: 17034
/trunk/HeuristicLab.Clients.Hive.Administrator	merged: 17037,17180,17184,17223

Context Navigation

Changeset 17246 for branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Clients.Hive.Administrator

Legend:

Download in other formats: