Changeset 8039
- Timestamp:
- 06/18/12 16:47:59 (12 years ago)
- Location:
- branches/ClientUserManagement
- Files:
-
- 3 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ClientUserManagement/HeuristicLab.Clients.Access.Administration/3.3/AccessAdministrationClient.cs
r7848 r8039 127 127 ExecuteActionAsync(StoreRoles, exceptionCallback); 128 128 } 129 130 //i don't think such a generic method is a good idea131 /*public static void Store(IAccessItem item) {132 133 } */134 129 #endregion 135 130 -
branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/HeuristicLab.Clients.Access.Views-3.3.csproj
r7611 r8039 106 106 </ItemGroup> 107 107 <ItemGroup> 108 <Compile Include="ClientViews\AdminClientView.cs">109 <SubType>UserControl</SubType>110 </Compile>111 <Compile Include="ClientViews\AdminClientView.Designer.cs">112 <DependentUpon>AdminClientView.cs</DependentUpon>113 </Compile>114 108 <Compile Include="ClientViews\ClientInformationDialog.cs"> 115 109 <SubType>Form</SubType> -
branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserGroupSelectionView.cs
r7555 r8039 62 62 63 63 void Instance_Refreshed(object sender, EventArgs e) { 64 //TODO: show loading bar65 64 if (AccessClient.Instance.UsersAndGroups != null) 66 65 this.itemsListView.Enabled = true; -
branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.cs
r7982 r8039 24 24 25 25 namespace HeuristicLab.Clients.Access.Views { 26 27 26 public partial class RefreshableLightweightUserInformationView : RefreshableView { 28 27 public RefreshableLightweightUserInformationView() { … … 60 59 lightweightUserInformationView.Enabled = true; 61 60 if (!UserInformation.Instance.UserExists) { 62 MessageBox.Show("Couldn't fetch user information from the server." + Environment.NewLine + "Please verify that you have an existing user and that your user name and password is correct. ", "HeuristicLab Access Service", MessageBoxButtons.OK, MessageBoxIcon.Error); 61 MessageBox.Show("Couldn't fetch user information from the server." + Environment.NewLine + 62 "Please verify that you have an existing user and that your user name and password is correct. ", "HeuristicLab Access Service", MessageBoxButtons.OK, MessageBoxIcon.Error); 63 63 lightweightUserInformationView.Content = null; 64 64 } else { -
branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/AccessClient.cs
r7536 r8039 90 90 #endregion 91 91 92 public static void Store(IAccessItem item) {93 //TODO: prevent storing of lightweight users94 }95 96 92 #region Events 97 93 public event EventHandler Refreshing; -
branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ClientInformationUtils.cs
r7553 r8039 35 35 OperatingSystem os = new OperatingSystem(); 36 36 ClientType cType = new ClientType(); 37 cType.Name = "HLClient";37 cType.Name = Settings.Default.ClientTypeName; 38 38 39 39 client.Id = GetUniqueMachineId(); -
branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ServiceClients/AccessItem.cs
r7637 r8039 93 93 } 94 94 95 public void Store() {96 AccessClient.Store(this);97 Modified = false;98 }99 100 95 protected void RaisePropertyChanged(string propertyName) { 101 96 OnPropertyChanged(new PropertyChangedEventArgs(propertyName)); -
branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ServiceClients/IAccessItem.cs
r7368 r8039 26 26 namespace HeuristicLab.Clients.Access { 27 27 public interface IAccessItem : IItem, INotifyPropertyChanged { 28 bool Modified { get; } 29 void Store(); 28 bool Modified { get; } 30 29 event EventHandler ModifiedChanged; 31 30 } -
branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ServiceClients/LightweightUser.cs
r7436 r8039 21 21 22 22 using System.Drawing; 23 using System.Linq; 23 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; … … 29 30 protected LightweightUser(LightweightUser original, Cloner cloner) 30 31 : base(original, cloner) { 31 FullName = original.FullName; 32 UserName = original.UserName; 32 this.FullName = original.FullName; 33 this.UserName = original.UserName; 34 this.EMail = original.EMail; 35 this.Groups = original.Groups.Select(x => (UserGroup)x.Clone(cloner)).ToList(); 36 this.Roles = original.Roles.Select(x => (Role)x.Clone(cloner)).ToList(); 33 37 } 34 38 -
branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/Settings.Designer.cs
r7623 r8039 2 2 // <auto-generated> 3 3 // This code was generated by a tool. 4 // Runtime Version:4.0.30319.5 304 // Runtime Version:4.0.30319.544 5 5 // 6 6 // Changes to this file may cause incorrect behavior and will be lost if … … 32 32 } 33 33 } 34 35 [global::System.Configuration.ApplicationScopedSettingAttribute()] 36 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 37 [global::System.Configuration.DefaultSettingValueAttribute("HLClient")] 38 public string ClientTypeName { 39 get { 40 return ((string)(this["ClientTypeName"])); 41 } 42 } 34 43 } 35 44 } -
branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/Settings.settings
r7553 r8039 6 6 <Value Profile="(Default)">HeuristicLab 3.3</Value> 7 7 </Setting> 8 <Setting Name="ClientTypeName" Type="System.String" Scope="Application"> 9 <Value Profile="(Default)">HLClient</Value> 10 </Setting> 8 11 </Settings> 9 12 </SettingsFile> -
branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/app.config
r7623 r8039 39 39 </system.serviceModel> 40 40 <applicationSettings> 41 <HeuristicLab.Clients.Access.Settings> 42 <setting name="HLExeName" serializeAs="String"> 43 <value>HeuristicLab 3.3</value> 44 </setting> 45 </HeuristicLab.Clients.Access.Settings> 41 <HeuristicLab.Clients.Access.Settings> 42 <setting name="HLExeName" serializeAs="String"> 43 <value>HeuristicLab 3.3</value> 44 </setting> 45 <setting name="ClientTypeName" serializeAs="String"> 46 <value>HLClient</value> 47 </setting> 48 </HeuristicLab.Clients.Access.Settings> 46 49 </applicationSettings> 47 50 </configuration> -
branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ascheibe_app.config
r7623 r8039 38 38 </client> 39 39 </system.serviceModel> 40 <applicationSettings> 41 <HeuristicLab.Clients.Access.Settings> 42 <setting name="HLExeName" serializeAs="String"> 43 <value>HeuristicLab 3.3</value> 44 </setting> 45 </HeuristicLab.Clients.Access.Settings> 46 </applicationSettings> 40 <applicationSettings> 41 <HeuristicLab.Clients.Access.Settings> 42 <setting name="HLExeName" serializeAs="String"> 43 <value>HeuristicLab 3.3</value> 44 </setting> 45 <setting name="ClientTypeName" serializeAs="String"> 46 <value>HLClient</value> 47 </setting> 48 </HeuristicLab.Clients.Access.Settings> 49 </applicationSettings> 47 50 </configuration> -
branches/ClientUserManagement/HeuristicLab.Services.Access.sln
r7614 r8039 17 17 EndProject 18 18 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.GeoIP", "HeuristicLab.GeoIP\1.12\HeuristicLab.GeoIP.csproj", "{BE9B0229-9150-49A4-AEA6-BB58E055992F}" 19 EndProject20 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Access-3.3.Tests", "HeuristicLab.Services.Access-3.3.Tests\HeuristicLab.Services.Access-3.3.Tests.csproj", "{70C5A73A-148C-45A2-938F-F8F6DAA80A02}"21 19 EndProject 22 20 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Access.Views-3.3", "HeuristicLab.Clients.Access.Views\3.3\HeuristicLab.Clients.Access.Views-3.3.csproj", "{FE856595-64CD-46DA-9CD2-FFF3E6B0D4F2}" … … 77 75 {BE9B0229-9150-49A4-AEA6-BB58E055992F}.Release|Mixed Platforms.Build.0 = Release|Any CPU 78 76 {BE9B0229-9150-49A4-AEA6-BB58E055992F}.Release|x86.ActiveCfg = Release|Any CPU 79 {70C5A73A-148C-45A2-938F-F8F6DAA80A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU80 {70C5A73A-148C-45A2-938F-F8F6DAA80A02}.Debug|Any CPU.Build.0 = Debug|Any CPU81 {70C5A73A-148C-45A2-938F-F8F6DAA80A02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU82 {70C5A73A-148C-45A2-938F-F8F6DAA80A02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU83 {70C5A73A-148C-45A2-938F-F8F6DAA80A02}.Debug|x86.ActiveCfg = Debug|Any CPU84 {70C5A73A-148C-45A2-938F-F8F6DAA80A02}.Release|Any CPU.ActiveCfg = Release|Any CPU85 {70C5A73A-148C-45A2-938F-F8F6DAA80A02}.Release|Any CPU.Build.0 = Release|Any CPU86 {70C5A73A-148C-45A2-938F-F8F6DAA80A02}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU87 {70C5A73A-148C-45A2-938F-F8F6DAA80A02}.Release|Mixed Platforms.Build.0 = Release|Any CPU88 {70C5A73A-148C-45A2-938F-F8F6DAA80A02}.Release|x86.ActiveCfg = Release|Any CPU89 77 {FE856595-64CD-46DA-9CD2-FFF3E6B0D4F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 90 78 {FE856595-64CD-46DA-9CD2-FFF3E6B0D4F2}.Debug|Any CPU.Build.0 = Debug|Any CPU -
branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/AccessService.cs
r7982 r8039 473 473 474 474 using (DA.AccessServiceDataContext context = new DA.AccessServiceDataContext()) { 475 //TODO: this has to be done recursive, so check if a group is in another476 //group because then the user is also in this group...477 475 var query = from g in context.UserGroupUserGroups 478 476 from ug in context.UserGroupBases.OfType<DA.UserGroup>() … … 656 654 RoleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 657 655 658 //TODO: usernames and rolenames have to be unique!659 656 MembershipUser msUser = Membership.GetUser((object)user.Id); 660 657 if (msUser != null) { … … 702 699 703 700 public IEnumerable<DT.UserGroup> GetUserGroupsOfUser(Guid userId) { 704 705 701 using (DA.AccessServiceDataContext context = new DA.AccessServiceDataContext()) { 706 702 var groupIds = from g in context.UserGroupUserGroups … … 812 808 #region UserGroupBase 813 809 public IEnumerable<DT.UserGroupBase> GetAllLeightweightUsersAndGroups() { 814 //TODO: it must be possible to include a role so not all users are returned but only the ones who are allowed to use a certain service815 810 List<DT.UserGroup> userGroups = new List<DT.UserGroup>(); 816 811 List<DT.UserGroupBase> result = new List<DT.UserGroupBase>(); 817 812 818 // this is just for generating users from asp.net authenticaton db; we should maybe provide an updatescript instead819 813 List<Guid> accessUserGuids = null; 820 814 using (DA.ASPNETAuthenticationDataContext context = new DA.ASPNETAuthenticationDataContext()) { -
branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/Role.cs
r7355 r8039 23 23 24 24 namespace HeuristicLab.Services.Access.DataTransfer { 25 26 25 [DataContract] 27 26 public class Role : AccessItem {
Note: See TracChangeset
for help on using the changeset viewer.