Changeset 6723 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs
- Timestamp:
- 09/08/11 14:37:52 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs
r6721 r6723 117 117 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 118 118 author.AuthorizeForExperiment(experimentId, Permission.Read); 119 return dao.GetJobs(x => x. HiveExperimentId == experimentId).Select(x => new LightweightTask(x)).ToArray();119 return dao.GetJobs(x => x.JobId == experimentId).Select(x => new LightweightTask(x)).ToArray(); 120 120 } 121 121 … … 239 239 240 240 #region HiveExperiment Methods 241 public HiveExperimentGetHiveExperiment(Guid id) {241 public Job GetHiveExperiment(Guid id) { 242 242 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 243 243 author.AuthorizeForExperiment(id, Permission.Read); 244 244 var hiveExperiment = dao.GetHiveExperiments(x => 245 x. HiveExperimentId == id246 && (x.OwnerUserId == userManager.CurrentUserId || x. HiveExperimentPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0)245 x.JobId == id 246 && (x.OwnerUserId == userManager.CurrentUserId || x.JobPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0) 247 247 ).FirstOrDefault(); 248 248 if (hiveExperiment != null) { … … 253 253 } 254 254 255 public IEnumerable< HiveExperiment> GetHiveExperiments() {256 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 257 var hiveExperiments = dao.GetHiveExperiments(x => x.OwnerUserId == userManager.CurrentUserId || x. HiveExperimentPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0);255 public IEnumerable<Job> GetHiveExperiments() { 256 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 257 var hiveExperiments = dao.GetHiveExperiments(x => x.OwnerUserId == userManager.CurrentUserId || x.JobPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0); 258 258 foreach (var he in hiveExperiments) { 259 259 author.AuthorizeForExperiment(he.Id, Permission.Read); … … 264 264 } 265 265 266 public IEnumerable< HiveExperiment> GetAllHiveExperiments() {266 public IEnumerable<Job> GetAllHiveExperiments() { 267 267 authen.AuthenticateForAnyRole(HiveRoles.Administrator); 268 268 var hiveExperiments = dao.GetHiveExperiments(x => true); … … 274 274 } 275 275 276 public Guid AddHiveExperiment( HiveExperimenthiveExperimentDto) {276 public Guid AddHiveExperiment(Job hiveExperimentDto) { 277 277 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 278 278 return trans.UseTransaction(() => { … … 283 283 } 284 284 285 public void UpdateHiveExperiment( HiveExperimenthiveExperimentDto) {285 public void UpdateHiveExperiment(Job hiveExperimentDto) { 286 286 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 287 287 author.AuthorizeForExperiment(hiveExperimentDto.Id, Permission.Full); … … 304 304 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 305 305 trans.UseTransaction(() => { 306 HiveExperimenthe = dao.GetHiveExperiment(hiveExperimentId);306 Job he = dao.GetHiveExperiment(hiveExperimentId); 307 307 if (he == null) throw new FaultException<FaultReason>(new FaultReason("Could not find hiveExperiment with id " + hiveExperimentId)); 308 308 Permission perm = DT.Convert.ToDto(dao.GetPermissionForExperiment(he.Id, userManager.CurrentUserId)); … … 315 315 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 316 316 trans.UseTransaction(() => { 317 HiveExperimenthe = dao.GetHiveExperiment(hiveExperimentId);317 Job he = dao.GetHiveExperiment(hiveExperimentId); 318 318 if (he == null) throw new FaultException<FaultReason>(new FaultReason("Could not find hiveExperiment with id " + hiveExperimentId)); 319 319 DA.Permission perm = dao.GetPermissionForExperiment(he.Id, userManager.CurrentUserId); … … 322 322 }); 323 323 } 324 public IEnumerable< HiveExperimentPermission> GetHiveExperimentPermissions(Guid hiveExperimentId) {324 public IEnumerable<JobPermission> GetHiveExperimentPermissions(Guid hiveExperimentId) { 325 325 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 326 326 return trans.UseTransaction(() => { 327 327 DA.Permission currentUserPermission = dao.GetPermissionForExperiment(hiveExperimentId, userManager.CurrentUserId); 328 328 if (currentUserPermission != DA.Permission.Full) throw new FaultException<FaultReason>(new FaultReason("Not allowed to list permissions for this experiment")); 329 return dao.GetHiveExperimentPermissions(x => x. HiveExperimentId == hiveExperimentId);329 return dao.GetHiveExperimentPermissions(x => x.JobId == hiveExperimentId); 330 330 }); 331 331 }
Note: See TracChangeset
for help on using the changeset viewer.