diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-17 23:35:57 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-17 11:35:57 -0400 |
commit | f20057271def2240474d64c57eeba8b365642c08 (patch) | |
tree | 4b7b081a4ab7b5ba8a593b651fc199d1d59732b4 | |
parent | 4b1c6cd8e5745a945df0f72233964f6aede8a3a6 (diff) | |
download | gitea-f20057271def2240474d64c57eeba8b365642c08.tar.gz gitea-f20057271def2240474d64c57eeba8b365642c08.zip |
Fix Org edit page bugs: renaming detection, maxlength (#24161)
## Before
* The renaming detection is wrong (eg: pasting a new name into the input
doesn't trigger the detection)
* The renaming prompt layout is not good
* Some MaxSize/maxlength rules is missing


## After
* Fix these problems

-rw-r--r-- | modules/structs/org.go | 6 | ||||
-rw-r--r-- | templates/org/create.tmpl | 2 | ||||
-rw-r--r-- | templates/org/settings/options.tmpl | 15 | ||||
-rw-r--r-- | web_src/js/features/common-organization.js | 19 |
4 files changed, 17 insertions, 25 deletions
diff --git a/modules/structs/org.go b/modules/structs/org.go index b4c58623fd..7c83dcdee7 100644 --- a/modules/structs/org.go +++ b/modules/structs/org.go @@ -30,8 +30,8 @@ type OrganizationPermissions struct { // CreateOrgOption options for creating an organization type CreateOrgOption struct { // required: true - UserName string `json:"username" binding:"Required"` - FullName string `json:"full_name"` + UserName string `json:"username" binding:"Required;Username;MaxSize(40)"` + FullName string `json:"full_name" binding:"MaxSize(100)"` Description string `json:"description" binding:"MaxSize(255)"` Website string `json:"website" binding:"ValidUrl;MaxSize(255)"` Location string `json:"location" binding:"MaxSize(50)"` @@ -45,7 +45,7 @@ type CreateOrgOption struct { // EditOrgOption options for editing an organization type EditOrgOption struct { - FullName string `json:"full_name"` + FullName string `json:"full_name" binding:"MaxSize(100)"` Description string `json:"description" binding:"MaxSize(255)"` Website string `json:"website" binding:"ValidUrl;MaxSize(255)"` Location string `json:"location" binding:"MaxSize(50)"` diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index f734a39a93..7e988ba0c7 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -11,7 +11,7 @@ {{template "base/alert" .}} <div class="inline required field {{if .Err_OrgName}}error{{end}}"> <label for="org_name">{{.locale.Tr "org.org_name_holder"}}</label> - <input id="org_name" name="org_name" value="{{.org_name}}" autofocus required> + <input id="org_name" name="org_name" value="{{.org_name}}" autofocus required maxlength="40"> <span class="help">{{.locale.Tr "org.org_name_helper"}}</span> </div> diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 833b97e347..1caa4210e6 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -14,26 +14,27 @@ {{.CsrfTokenHtml}} <div class="required field {{if .Err_Name}}error{{end}}"> <label for="org_name">{{.locale.Tr "org.org_name_holder"}} - <span class="text red gt-hidden" id="org-name-change-prompt"> {{.locale.Tr "org.settings.change_orgname_prompt"}}</span> - <span class="text red gt-hidden" id="org-name-change-redirect-prompt"> {{.locale.Tr "org.settings.change_orgname_redirect_prompt"}}</span> + <span class="text red gt-hidden" id="org-name-change-prompt"> + <br>{{.locale.Tr "org.settings.change_orgname_prompt"}}<br>{{.locale.Tr "org.settings.change_orgname_redirect_prompt"}} + </span> </label> - <input id="org_name" name="name" value="{{.Org.Name}}" data-org-name="{{.Org.Name}}" autofocus required> + <input id="org_name" name="name" value="{{.Org.Name}}" data-org-name="{{.Org.Name}}" autofocus required maxlength="40"> </div> <div class="field {{if .Err_FullName}}error{{end}}"> <label for="full_name">{{.locale.Tr "org.org_full_name_holder"}}</label> - <input id="full_name" name="full_name" value="{{.Org.FullName}}"> + <input id="full_name" name="full_name" value="{{.Org.FullName}}" maxlength="100"> </div> <div class="field {{if .Err_Description}}error{{end}}"> <label for="description">{{$.locale.Tr "org.org_desc"}}</label> - <textarea id="description" name="description" rows="2">{{.Org.Description}}</textarea> + <textarea id="description" name="description" rows="2" maxlength="255">{{.Org.Description}}</textarea> </div> <div class="field {{if .Err_Website}}error{{end}}"> <label for="website">{{.locale.Tr "org.settings.website"}}</label> - <input id="website" name="website" type="url" value="{{.Org.Website}}"> + <input id="website" name="website" type="url" value="{{.Org.Website}}" maxlength="255"> </div> <div class="field"> <label for="location">{{.locale.Tr "org.settings.location"}}</label> - <input id="location" name="location" value="{{.Org.Location}}"> + <input id="location" name="location" value="{{.Org.Location}}" maxlength="50"> </div> <div class="ui divider"></div> diff --git a/web_src/js/features/common-organization.js b/web_src/js/features/common-organization.js index 1796efc6a8..352e824b05 100644 --- a/web_src/js/features/common-organization.js +++ b/web_src/js/features/common-organization.js @@ -1,25 +1,16 @@ import $ from 'jquery'; import {initCompLabelEdit} from './comp/LabelEdit.js'; -import {hideElem, showElem} from '../utils/dom.js'; +import {toggleElem} from '../utils/dom.js'; export function initCommonOrganization() { if ($('.organization').length === 0) { return; } - if ($('.organization.settings.options').length > 0) { - $('#org_name').on('keyup', function () { - const $prompt = $('#org-name-change-prompt'); - const $prompt_redirect = $('#org-name-change-redirect-prompt'); - if ($(this).val().toString().toLowerCase() !== $(this).data('org-name').toString().toLowerCase()) { - showElem($prompt); - showElem($prompt_redirect); - } else { - hideElem($prompt); - hideElem($prompt_redirect); - } - }); - } + $('.organization.settings.options #org_name').on('input', function () { + const nameChanged = $(this).val().toLowerCase() !== $(this).attr('data-org-name').toLowerCase(); + toggleElem('#org-name-change-prompt', nameChanged); + }); // Labels initCompLabelEdit('.organization.settings.labels'); |