Changeset 9107 for trunk

Timestamp:

01/04/13 14:21:22 (12 years ago)

Author:

ascheibe

Message:

#1950 fixed handling of IsAllowedPrivileged in the Hive Job Manager

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/Job.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

@@ -50 +50 @@
 
     protected override RefreshableJob CreateItem() {
-      var refreshableJob = new RefreshableJob() { IsAllowedPrivileged = HiveClient.Instance.IsAllowedPrivileged };
+      var refreshableJob = new RefreshableJob();
       refreshableJob.Job.Name = "New Hive Job";
       return refreshableJob;

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

@@ -375 +375 @@
       this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the task will be executed in a privileged sandbox on the slave.");
       this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
-      this.isPrivilegedCheckBox.Validated += new System.EventHandler(this.isPrivilegedCheckBox_Validated);
+      this.isPrivilegedCheckBox.CheckedChanged += new System.EventHandler(this.isPrivilegedCheckBox_CheckChanged);
       // 
       // refreshAutomaticallyCheckBox

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -140 +140 @@
           executionTimeTextBox.Text = Content.ExecutionTime.ToString();
           resourceNamesTextBox.Text = Content.Job.ResourceNames;
-          isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;
+          isPrivilegedCheckBox.Checked = Content.IsAllowedPrivileged;
           refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
           logView.Content = Content.Log;
@@ -178 +178 @@
         this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
 
-        this.isPrivilegedCheckBox.Enabled = Content.IsAllowedPrivileged && Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded) && !Content.IsProgressing;
+        this.isPrivilegedCheckBox.Enabled = HiveClient.Instance.IsAllowedPrivileged && Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded) && !Content.IsProgressing;
         this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing;
         this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded && !Content.IsProgressing;
@@ -345 +345 @@
         Invoke(new EventHandler(Content_IsAllowedPrivilegedChanged), sender, e);
       else {
+        isPrivilegedCheckBox.Checked = Content.IsAllowedPrivileged;
         SetEnabledStateOfControls();
       }
@@ -447 +448 @@
     }
 
-    private void isPrivilegedCheckBox_Validated(object sender, EventArgs e) {
-      if (Content != null && !SuppressEvents) Content.Job.IsPrivileged = isPrivilegedCheckBox.Checked;
+    private void isPrivilegedCheckBox_CheckChanged(object sender, EventArgs e) {
+      if (Content != null && !SuppressEvents) Content.IsAllowedPrivileged = isPrivilegedCheckBox.Checked;
     }
 

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -83 +83 @@
 
       try {
-        this.IsAllowedPrivileged = HiveServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
+        IsAllowedPrivileged = HiveServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
 
         var oldJobs = jobs ?? new ItemCollection<RefreshableJob>();

trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -158 +158 @@
 
     // may execute jobs with privileged permissions on slaves
-    private bool isAllowedPrivileged = true;
     public bool IsAllowedPrivileged {
-      get { return isAllowedPrivileged; }
+      get { return Job.IsPrivileged; }
       set {
-        if (value != isAllowedPrivileged) {
-          isAllowedPrivileged = value;
+        if (value != Job.IsPrivileged) {
+          Job.IsPrivileged = value;
           OnIsAllowedPrivilegedChanged();
         }

trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Job.cs

@@ -35 +35 @@
     #region Constructors and Cloning
     public Job() {
-      this.ResourceNames = "HEAL";
-      this.DateCreated = DateTime.Now;
-      this.Permission = Permission.Full;
+      ResourceNames = "HEAL";
+      DateCreated = DateTime.Now;
+      Permission = Permission.Full;
     }