diff --git a/object/model.go b/object/model.go index 4484b33f..41679530 100644 --- a/object/model.go +++ b/object/model.go @@ -27,6 +27,7 @@ type Model struct { Name string `xorm:"varchar(100) notnull pk" json:"name"` CreatedTime string `xorm:"varchar(100)" json:"createdTime"` DisplayName string `xorm:"varchar(100)" json:"displayName"` + Description string `xorm:"varchar(100)" json:"description"` ModelText string `xorm:"mediumtext" json:"modelText"` IsEnabled bool `json:"isEnabled"` diff --git a/object/permission.go b/object/permission.go index 8cfd6ea8..8c7e7f13 100644 --- a/object/permission.go +++ b/object/permission.go @@ -27,6 +27,7 @@ type Permission struct { Name string `xorm:"varchar(100) notnull pk" json:"name"` CreatedTime string `xorm:"varchar(100)" json:"createdTime"` DisplayName string `xorm:"varchar(100)" json:"displayName"` + Description string `xorm:"varchar(100)" json:"description"` Users []string `xorm:"mediumtext" json:"users"` Roles []string `xorm:"mediumtext" json:"roles"` diff --git a/object/role.go b/object/role.go index 8a3276c0..1d4c0829 100644 --- a/object/role.go +++ b/object/role.go @@ -29,6 +29,7 @@ type Role struct { Name string `xorm:"varchar(100) notnull pk" json:"name"` CreatedTime string `xorm:"varchar(100)" json:"createdTime"` DisplayName string `xorm:"varchar(100)" json:"displayName"` + Description string `xorm:"varchar(100)" json:"description"` Users []string `xorm:"mediumtext" json:"users"` Roles []string `xorm:"mediumtext" json:"roles"` diff --git a/web/src/ModelEditPage.js b/web/src/ModelEditPage.js index f0efdce7..1b8cbb7f 100644 --- a/web/src/ModelEditPage.js +++ b/web/src/ModelEditPage.js @@ -122,6 +122,16 @@ class ModelEditPage extends React.Component { }} /> + + + {Setting.getLabel(i18next.t("general:Description"), i18next.t("general:Description - Tooltip"))} : + + + { + this.updateModelField("description", e.target.value); + }} /> + + {Setting.getLabel(i18next.t("model:Model text"), i18next.t("model:Model text - Tooltip"))} : diff --git a/web/src/PermissionEditPage.js b/web/src/PermissionEditPage.js index f316d664..fd2520f1 100644 --- a/web/src/PermissionEditPage.js +++ b/web/src/PermissionEditPage.js @@ -190,6 +190,16 @@ class PermissionEditPage extends React.Component { }} /> + + + {Setting.getLabel(i18next.t("general:Description"), i18next.t("general:Description - Tooltip"))} : + + + { + this.updatePermissionField("description", e.target.value); + }} /> + + {Setting.getLabel(i18next.t("general:Model"), i18next.t("general:Model - Tooltip"))} : diff --git a/web/src/RoleEditPage.js b/web/src/RoleEditPage.js index a21b4b5d..2c8f9a30 100644 --- a/web/src/RoleEditPage.js +++ b/web/src/RoleEditPage.js @@ -136,6 +136,16 @@ class RoleEditPage extends React.Component { }} /> + + + {Setting.getLabel(i18next.t("general:Description"), i18next.t("general:Description - Tooltip"))} : + + + { + this.updateRoleField("description", e.target.value); + }} /> + + {Setting.getLabel(i18next.t("role:Sub users"), i18next.t("role:Sub users - Tooltip"))} :