mirror of
https://github.com/azaion/annotations.git
synced 2026-04-22 10:36:30 +00:00
fixed sorting in datasetexplorer, also show date
make annotationstatus more clear
This commit is contained in:
@@ -88,7 +88,7 @@ public class AnnotationService : IAnnotationService, INotificationHandler<Annota
|
||||
|
||||
if (email != _api.CurrentUser.Email) //Don't process messages by yourself
|
||||
{
|
||||
if (annotationStatus.In(AnnotationStatus.Created, AnnotationStatus.ValidatedEdited))
|
||||
if (annotationStatus.In(AnnotationStatus.Created, AnnotationStatus.Edited))
|
||||
{
|
||||
var msg = MessagePackSerializer.Deserialize<AnnotationMessage>(message.Data.Contents);
|
||||
await SaveAnnotationInner(
|
||||
@@ -161,25 +161,18 @@ public class AnnotationService : IAnnotationService, INotificationHandler<Annota
|
||||
|
||||
if (ann != null) //Annotation is already exists
|
||||
{
|
||||
status = AnnotationStatus.Edited;
|
||||
|
||||
var annotationUpdatable = db.Annotations
|
||||
.Where(x => x.Name == fName)
|
||||
.Set(x => x.Source, source)
|
||||
.Set(x => x.CreatedRole, userRole);
|
||||
.Set(x => x.Source, source);
|
||||
|
||||
if (userRole.IsValidator() && source == SourceEnum.Manual)
|
||||
{
|
||||
status = AnnotationStatus.ValidatedEdited;
|
||||
|
||||
annotationUpdatable = annotationUpdatable
|
||||
.Set(x => x.ValidateDate, createdDate)
|
||||
.Set(x => x.ValidateEmail, createdEmail);
|
||||
}
|
||||
else
|
||||
{
|
||||
annotationUpdatable = annotationUpdatable
|
||||
.Set(x => x.CreatedDate, createdDate)
|
||||
.Set(x => x.CreatedEmail, createdEmail);
|
||||
}
|
||||
|
||||
await annotationUpdatable
|
||||
.Set(x => x.AnnotationStatus, status)
|
||||
|
||||
Reference in New Issue
Block a user