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

Merge branch 'feature/PRXS-1617-SyncReasons' into 'master'

Добавлено поле RevisionDescription в Item

See merge request perxis/perxis-go!100
parents d2f57a88 a47898af
No related branches found
No related tags found
No related merge requests found
Subproject commit 8c2633f87320a29c7abd9389cedda60a64f88bfa Subproject commit b6932f502c43944f278af9097607fd17af4b8b8d
...@@ -69,6 +69,7 @@ var SystemFields = []string{ ...@@ -69,6 +69,7 @@ var SystemFields = []string{
"updated_at", "updated_at",
"updated_by", "updated_by",
"revision_id", "revision_id",
"revision_description",
"data", "data",
"translations", "translations",
"locale", "locale",
...@@ -100,6 +101,7 @@ type Item struct { ...@@ -100,6 +101,7 @@ type Item struct {
Locale string `json:"locale" bson:"-"` Locale string `json:"locale" bson:"-"`
Translations map[string]map[string]interface{} `json:"translations" bson:"translations,omitempty"` Translations map[string]map[string]interface{} `json:"translations" bson:"translations,omitempty"`
RevisionID string `json:"revId,omitempty" bson:"revision_id"` RevisionID string `json:"revId,omitempty" bson:"revision_id"`
RevisionDescription string `json:"revDescription,omitempty" bson:"revision_description"`
Permissions *Permissions `json:"permissions,omitempty" bson:"-"` Permissions *Permissions `json:"permissions,omitempty" bson:"-"`
// Флаги записи // Флаги записи
...@@ -146,6 +148,7 @@ func (i *Item) ToMap() map[string]interface{} { ...@@ -146,6 +148,7 @@ func (i *Item) ToMap() map[string]interface{} {
"updated_at": i.UpdatedAt, "updated_at": i.UpdatedAt,
"updated_by": i.UpdatedBy, "updated_by": i.UpdatedBy,
"revision_id": i.RevisionID, "revision_id": i.RevisionID,
"revision_description": i.RevisionDescription,
"data": i.Data, "data": i.Data,
"translations": i.Translations, "translations": i.Translations,
"locale": i.Locale, "locale": i.Locale,
...@@ -304,6 +307,8 @@ func (i *Item) SetSystemField(field string, value interface{}) error { ...@@ -304,6 +307,8 @@ func (i *Item) SetSystemField(field string, value interface{}) error {
i.UpdatedAt, ok = value.(time.Time) i.UpdatedAt, ok = value.(time.Time)
case "revision_id": case "revision_id":
i.RevisionID, ok = value.(string) i.RevisionID, ok = value.(string)
case "revision_description":
i.RevisionDescription, ok = value.(string)
case "hidden": case "hidden":
i.Hidden, ok = value.(bool) i.Hidden, ok = value.(bool)
case "deleted": case "deleted":
...@@ -344,6 +349,8 @@ func (i *Item) GetSystem(field string) (any, error) { ...@@ -344,6 +349,8 @@ func (i *Item) GetSystem(field string) (any, error) {
return i.UpdatedAt, nil return i.UpdatedAt, nil
case "revision_id": case "revision_id":
return i.RevisionID, nil return i.RevisionID, nil
case "revision_description":
return i.RevisionDescription, nil
case "hidden": case "hidden":
return i.Hidden, nil return i.Hidden, nil
case "deleted": case "deleted":
...@@ -394,7 +401,7 @@ func (i *Item) Get(field string) (any, error) { ...@@ -394,7 +401,7 @@ func (i *Item) Get(field string) (any, error) {
// GetSystemField возвращает описание поля для системных аттрибутов Item // GetSystemField возвращает описание поля для системных аттрибутов Item
func GetSystemField(fld string) (*field.Field, error) { func GetSystemField(fld string) (*field.Field, error) {
switch fld { switch fld {
case "id", "space_id", "env_id", "collection_id", "revision_id": case "id", "space_id", "env_id", "collection_id", "revision_id", "revision_description":
return field.String(), nil return field.String(), nil
case "created_rev_at", "created_at", "updated_at", "published_at": case "created_rev_at", "created_at", "updated_at", "published_at":
return field.Time(), nil return field.Time(), nil
...@@ -447,6 +454,7 @@ func ItemToProto(item *Item) *pb.Item { ...@@ -447,6 +454,7 @@ func ItemToProto(item *Item) *pb.Item {
CreatedBy: item.CreatedBy, CreatedBy: item.CreatedBy,
UpdatedBy: item.UpdatedBy, UpdatedBy: item.UpdatedBy,
RevisionId: item.RevisionID, RevisionId: item.RevisionID,
RevisionDescription: item.RevisionDescription,
Locale: item.Locale, Locale: item.Locale,
Hidden: item.Hidden, Hidden: item.Hidden,
Template: item.Template, Template: item.Template,
...@@ -495,6 +503,7 @@ func ItemFromProto(protoItem *pb.Item) *Item { ...@@ -495,6 +503,7 @@ func ItemFromProto(protoItem *pb.Item) *Item {
CreatedBy: protoItem.CreatedBy, CreatedBy: protoItem.CreatedBy,
UpdatedBy: protoItem.UpdatedBy, UpdatedBy: protoItem.UpdatedBy,
RevisionID: protoItem.RevisionId, RevisionID: protoItem.RevisionId,
RevisionDescription: protoItem.RevisionDescription,
Locale: protoItem.Locale, Locale: protoItem.Locale,
Hidden: protoItem.Hidden, Hidden: protoItem.Hidden,
Template: protoItem.Template, Template: protoItem.Template,
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment