diff options
| author | KN4CK3R <KN4CK3R@users.noreply.github.com> | 2021-05-02 21:03:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-02 21:03:15 +0200 |
| commit | 8c8471e75464fa6253a44cdbb8f6ad233aae9067 (patch) | |
| tree | f8fd7e87b26f2b735208cb95de147c2ef93d814e /modules | |
| parent | 0590176a23c056b274bd30ff7cec8f8a203f0665 (diff) | |
| download | gitea-8c8471e75464fa6253a44cdbb8f6ad233aae9067.tar.gz gitea-8c8471e75464fa6253a44cdbb8f6ad233aae9067.zip | |
Addition to (Add Location, Website and Description to API #15675) (#15690)
* Use same name as other structs.
* Sync with normal forms.
* Edit description with API.
* Workaround for nil value.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/structs/admin_user.go | 3 | ||||
| -rw-r--r-- | modules/structs/org.go | 12 | ||||
| -rw-r--r-- | modules/structs/user.go | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/modules/structs/admin_user.go b/modules/structs/admin_user.go index ee1738579a..5da4e9608b 100644 --- a/modules/structs/admin_user.go +++ b/modules/structs/admin_user.go @@ -32,8 +32,9 @@ type EditUserOption struct { FullName *string `json:"full_name" binding:"MaxSize(100)"` Password string `json:"password" binding:"MaxSize(255)"` MustChangePassword *bool `json:"must_change_password"` - Website *string `json:"website" binding:"MaxSize(50)"` + Website *string `json:"website" binding:"OmitEmpty;ValidUrl;MaxSize(255)"` Location *string `json:"location" binding:"MaxSize(50)"` + Description *string `json:"description" binding:"MaxSize(255)"` Active *bool `json:"active"` Admin *bool `json:"admin"` AllowGitHook *bool `json:"allow_git_hook"` diff --git a/modules/structs/org.go b/modules/structs/org.go index 4b79a4e70a..483f5044a8 100644 --- a/modules/structs/org.go +++ b/modules/structs/org.go @@ -22,9 +22,9 @@ type CreateOrgOption struct { // required: true UserName string `json:"username" binding:"Required"` FullName string `json:"full_name"` - Description string `json:"description"` - Website string `json:"website"` - Location string `json:"location"` + Description string `json:"description" binding:"MaxSize(255)"` + Website string `json:"website" binding:"ValidUrl;MaxSize(255)"` + Location string `json:"location" binding:"MaxSize(50)"` // possible values are `public` (default), `limited` or `private` // enum: public,limited,private Visibility string `json:"visibility" binding:"In(,public,limited,private)"` @@ -34,9 +34,9 @@ type CreateOrgOption struct { // EditOrgOption options for editing an organization type EditOrgOption struct { FullName string `json:"full_name"` - Description string `json:"description"` - Website string `json:"website"` - Location string `json:"location"` + Description string `json:"description" binding:"MaxSize(255)"` + Website string `json:"website" binding:"ValidUrl;MaxSize(255)"` + Location string `json:"location" binding:"MaxSize(50)"` // possible values are `public`, `limited` or `private` // enum: public,limited,private Visibility string `json:"visibility" binding:"In(,public,limited,private)"` diff --git a/modules/structs/user.go b/modules/structs/user.go index efd246e566..b5d5b9298e 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -37,8 +37,8 @@ type User struct { Location string `json:"location"` // the user's website Website string `json:"website"` - // the user's biography - Description string `json:"bio"` + // the user's description + Description string `json:"description"` } // MarshalJSON implements the json.Marshaler interface for User, adding field(s) for backward compatibility |