Changeset 16187 for trunk


Ignore:
Timestamp:
09/26/18 15:02:09 (11 months ago)
Author:
jzenisek
Message:

#2839

  • fixed enabled state of controls bug for initial project selection regarding permission detail views
  • fixed problem at resource assignment for root projects
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.cs

    r16186 r16187  
    4545    protected override void SetEnabledStateOfControls() {
    4646      base.SetEnabledStateOfControls();
     47      this.Locked = true;
    4748      refreshButton.Enabled = Content != null;
    4849    }
  • trunk/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs

    r16186 r16187  
    7878        detailsViewHost.Content = null;
    7979      } else {
    80         UpdatePermissionList();
    81         detailsViewHost.ActiveView.Locked = true;
    82       }
     80        UpdatePermissionList();       
     81      }
     82      SetEnabledStateOfControls();
    8383    }
    8484
     
    9090      saveButton.Enabled = enabled;
    9191      treeView.Enabled = enabled;
     92
     93      if (detailsViewHost != null) {
     94        detailsViewHost.Locked = true;
     95      }
     96
    9297    }
    9398    #endregion
  • trunk/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

    r16117 r16187  
    2222using System;
    2323using System.Collections.Generic;
     24using System.Linq;
    2425using System.Threading.Tasks;
    2526using System.Windows.Forms;
     
    4647      this.itemsListView.FullRowSelect = true;
    4748
    48       this.itemsListView.ListViewItemSorter = new ListViewItemComparer(new int[] { 2, 0 }, new SortOrder[] { SortOrder.Ascending, SortOrder.Ascending });
     49      this.itemsListView.ListViewItemSorter = new ListViewItemComparer(new int[] { 2, 0 }, new SortOrder[] { SortOrder.Ascending, SortOrder.Ascending });     
    4950
    5051      foreach (ColumnHeader c in this.itemsListView.Columns) {
     
    6364      itemsListView.Sorting = sortOrder;
    6465      itemsListView.Sort();
    65       //AdjustListViewColumnSizes();
     66      AdjustListViewColumnSizes();
    6667    }
    6768
  • trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs

    r16117 r16187  
    12421242
    12431243          var assignedResources = project.AssignedProjectResources.Select(x => x.ResourceId).ToArray();
    1244           if (!isParent) resourceIds = assignedResources.ToList();
     1244          if (!isParent && !isAdmin) resourceIds = assignedResources.ToList();
    12451245          var removedAssignments = assignedResources.Except(resourceIds);
    12461246
Note: See TracChangeset for help on using the changeset viewer.