Skip to content
Snippets Groups Projects
Commit 31bdb3a1 authored by Pavel Antonov's avatar Pavel Antonov :asterisk:
Browse files

Merge branch 'feature/2885-ListRevisionsSort' into 'master'

Удален параметр сортировки из опций запроса ListRevisions

See merge request perxis/perxis-go!407
parents 514a145c ec9aab7a
No related branches found
No related tags found
No related merge requests found
......@@ -617,9 +617,12 @@ func ListRevisionsOptionsToProto(opts ...*ListRevisionsOptions) *pb.ListRevision
}
o := MergeListRevisionsOptions(opts...)
return &pb.ListRevisionsOptions{
Offset: int32(o.Offset),
Limit: int32(o.Limit),
Fields: o.Fields,
ExcludeFields: o.ExcludeFields,
LocaleId: o.LocaleID,
TranslationsIds: o.TranslationsIDs,
Options: options.FindOptionsToPB(&o.FindOptions),
}
}
......@@ -627,14 +630,16 @@ func ListRevisionsOptionsFromProto(opts *pb.ListRevisionsOptions) *ListRevisions
if opts == nil {
return nil
}
o := &ListRevisionsOptions{
fo := options.New(int(opts.Offset), int(opts.Limit))
fo.FieldOptions = options.FieldOptions{
Fields: opts.Fields,
ExcludeFields: opts.ExcludeFields,
}
return &ListRevisionsOptions{
FindOptions: *fo,
LocaleID: opts.LocaleId,
TranslationsIDs: opts.TranslationsIds,
}
if fo := options.FindOptionsFromPB(opts.Options); fo != nil {
o.FindOptions = *fo
}
return o
}
type ArchiveOptions struct {
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment