Changeset 7725
- Timestamp:
- Jun 11, 2019, 4:10:52 PM (4 years ago)
- Location:
- branches/3.15-stable/src/core/net/sf/basedb/core
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.15-stable/src/core/net/sf/basedb/core/Job.java
r7605 r7725 1851 1851 { 1852 1852 DbControl dc = getDbControl(); 1853 Message m = Message.getNewSystemMessage(dc, get Owner(), "SYSTEM", null, this);1853 Message m = Message.getNewSystemMessage(dc, getData().getOwner(), "SYSTEM", null, getData()); 1854 1854 m.setDescription(getStatusMessage()); 1855 1855 String jobName = net.sf.basedb.util.Values.trim(getName(), Message.MAX_NAME_LENGTH - 20); -
branches/3.15-stable/src/core/net/sf/basedb/core/Message.java
r7452 r7725 23 23 package net.sf.basedb.core; 24 24 25 import net.sf.basedb.core.data.JobData; 25 26 import net.sf.basedb.core.data.MessageData; 26 27 import net.sf.basedb.core.data.UserData; … … 73 74 Message m = dc.newItem(Message.class); 74 75 m.setName("New message"); 75 m.setTo(to );76 m.setTo(to == null ? null : to.getData()); 76 77 m.setFrom(fromName); 77 m.setSender(fromUser );78 m.setSender(fromUser == null ? null : fromUser.getData()); 78 79 m.getData().setTimeSent(new Date()); 79 m.setJob(job );80 m.setJob(job == null ? null : job.getData()); 80 81 return m; 81 82 } … … 94 95 @throws BaseException If there is an error 95 96 */ 96 static Message getNewSystemMessage(DbControl dc, User to, String fromName, User fromUser, Jobjob)97 static Message getNewSystemMessage(DbControl dc, UserData to, String fromName, UserData fromUser, JobData job) 97 98 { 98 99 Message m = dc.newItem(Message.class); … … 325 326 @throws InvalidDataException If the user is null 326 327 */ 327 private void setTo(User to)328 private void setTo(UserData to) 328 329 throws InvalidDataException 329 330 { 330 331 if (to == null) throw new InvalidUseOfNullException("to"); 331 getData().setTo(to .getData());332 sendAsEmail = EmailUtil.isEnabled( to);332 getData().setTo(to); 333 sendAsEmail = EmailUtil.isEnabled() && to.getSendMessagesAsEmail() && EmailUtil.isValidEmail(to.getEmail()); 333 334 } 334 335 … … 385 386 } 386 387 387 private void setSender(User sender)388 private void setSender(UserData sender) 388 389 { 389 390 getData().setFromId(sender == null ? 0 : sender.getId()); … … 402 403 return getDbControl().getItem(Job.class, getData().getJob()); 403 404 } 404 private void setJob(Job job)405 private void setJob(JobData job) 405 406 throws PermissionDeniedException 406 407 { 407 if (job != null) job.checkPermission(Permission.READ); 408 getData().setJob(job == null ? null : job.getData()); 408 getData().setJob(job == null ? null : job); 409 409 } 410 410
Note: See TracChangeset
for help on using the changeset viewer.