Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support system/user default clone editors #22378

Closed
wants to merge 16 commits into from
Closed

Support system/user default clone editors #22378

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a0bd584
Support default clone editor
lunny Jan 9, 2023
46a0375
fix lint
lunny Jan 9, 2023
c14cd96
Merge branch 'main' into lunny/default_editor
lunny Jan 9, 2023
1c717e9
User could select his favorate editor
lunny Jan 9, 2023
efcfc96
fix lint
lunny Jan 9, 2023
e2717c1
Allow chose multiple editors
lunny Jan 10, 2023
ed38cdc
Merge branch 'main' into lunny/default_editor
lunny Jan 10, 2023
58a6a08
fix unnecessary argument
lunny Jan 10, 2023
5b92f63
Fix lint
lunny Jan 10, 2023
11c74a6
Fix typo
lunny Jan 10, 2023
b555176
Apply suggestions from code review
lunny Jan 10, 2023
dcb8580
improve code
lunny Jan 10, 2023
60a9132
Merge branch 'main' into lunny/default_editor
lunny Jan 10, 2023
1dfcab4
merge main branch
lunny Jan 11, 2023
945879f
merge main branch
lunny Feb 1, 2023
9b1f268
merge main branch
lunny Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix unnecessary argument
  • Loading branch information
@lunny
lunny committed Jan 10, 2023
commit 58a6a08833a8c43c4c1f04e974bc6c7de2f8ceb5
6 changes: 1 addition & 5 deletions routers/web/admin/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,7 @@ func Config(ctx *context.Context) {
ctx.Data["EnableXORMLog"] = setting.EnableXORMLog
ctx.Data["LogSQL"] = setting.Database.LogSQL

editors, err := dev.GetEditors()
if err != nil {
ctx.ServerError("system_model.GetAllSettings", err)
return
}
editors := dev.GetEditors()

defaultEditorS := systemSettings.Get(dev.KeyDevDefaultEditors)
if defaultEditorS.SettingValue == "" {
Expand Down
6 changes: 1 addition & 5 deletions routers/web/user/setting/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,11 +376,7 @@ func Appearance(ctx *context.Context) {
return forms.IsUserHiddenCommentTypeGroupChecked(commentTypeGroup, hiddenCommentTypes)
}

editors, err := dev.GetEditors()
if err != nil {
ctx.ServerError("dev.GetEditors", err)
return
}
editors := dev.GetEditors()

myDefaultEditors, err := dev.GetUserDefaultEditorsWithFallback(ctx.Doer)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions services/dev/editor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ func GetEditorsByNames(names []string) []*Editor {
}

// GetEditors returns all editors
func GetEditors() ([]Editor, error) {
return defaultEditors, nil
func GetEditors() []Editor {
return defaultEditors
}

func DefaultEditorsNames() string {
Expand Down