|
|
|
<div class="ui stackable grid">
|
|
|
|
<!-- I know, there is probably a better way to do this (moved from sidebar.tmpl, original author: 6543 @ 2021-02-28) -->
|
|
|
|
<!-- Agree, there should be a better way, eg: introduce window.config.pageData (original author: wxiaoguang @ 2021-09-05) -->
|
|
|
|
<input type="hidden" id="repolink" value="{{$.RepoRelPath}}">
|
|
|
|
<input type="hidden" id="repoId" value="{{.Repository.ID}}">
|
|
|
|
<input type="hidden" id="issueIndex" value="{{.Issue.Index}}">
|
|
|
|
<input type="hidden" id="type" value="{{.IssueType}}">
|
|
|
|
|
|
|
|
{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
|
|
|
|
<div class="twelve wide column comment-list prevent-before-timeline">
|
|
|
|
<div class="ui timeline">
|
|
|
|
<div id="{{.Issue.HashTag}}" class="timeline-item comment first">
|
|
|
|
{{if .Issue.OriginalAuthor}}
|
|
|
|
<span class="timeline-avatar"><img src="{{AppSubUrl}}/assets/img/avatar_default.png"></span>
|
|
|
|
{{else}}
|
|
|
|
<a class="timeline-avatar" {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
{{avatar $.Context .Issue.Poster}}
|
|
|
|
</a>
|
|
|
|
{{end}}
|
|
|
|
<div class="content comment-container">
|
|
|
|
<div class="ui top attached header comment-header gt-df gt-ac gt-sb" role="heading" aria-level="3">
|
|
|
|
<div class="comment-header-left gt-df gt-ac">
|
|
|
|
{{if .Issue.OriginalAuthor}}
|
|
|
|
<span class="text black gt-bold">
|
|
|
|
{{svg (MigrationIcon .Repository.GetOriginalURLHostname)}}
|
|
|
|
{{.Issue.OriginalAuthor}}
|
|
|
|
</span>
|
|
|
|
<span class="text grey">
|
|
|
|
{{.locale.Tr "repo.issues.commented_at" (.Issue.HashTag|Escape) $createdStr | Safe}}
|
|
|
|
</span>
|
|
|
|
<span class="text migrate">
|
|
|
|
{{if .Repository.OriginalURL}} ({{$.locale.Tr "repo.migrated_from" (.Repository.OriginalURL|Escape) (.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}
|
|
|
|
</span>
|
|
|
|
{{else}}
|
Improve UI on mobile (#19546)
Start making the mobile experience not painful and be actually usable. This contains a few smaller changes to enhance this experience.
- Submit buttons on the review forms aren't columns anymore and are now allowed to be displayed on one row.
- The label/milestone & New Issue buttons were given each own row even tough, there's enough place to do it one the same row. This commit fixes that.
- The issues+Pull tab on repo's has a third item besides the label/milestone & New Issue buttons, the search bar. On desktop there's enough place to do this on one row, for mobile it isn't, currently it was using for each item a new row. This commits fixes that by only giving the searchbar a new row and have the other two buttons on the same row.
- The notification table will now be show a scrollbar instead of overflow.
- The repo buttons(Watch, Star, Fork) on mobile were showing quite big and the SVG wasn't even displayed on the same line, if the count of those numbers were too high it would even overflow. This commit removes the SVG, as there isn't any place to show them on the same row and allows them to have a new row if the counts of those buttons are high.
- The admin page can show you a lot of interesting information, on mobile the System Status + Configuration weren't properly displayed as the margin's were too high. This commit fixes that by reducing the margin to a number that makes sense on mobile.
- Fixes to not overflow the tables but instead force them to be scrollable.
- When viewing a issue or pull request, the comments aren't full-width but instead 80% and aligned to right, on mobile this is a annoyance as there isn't much width to begin with. This commits fixes that by forcing full-width and removing the avatars on the left side and instead including them inline in the comment header.
3 years ago
|
|
|
<a class="inline-timeline-avatar" href="{{.Issue.Poster.HomeLink}}">
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
{{avatar $.Context .Issue.Poster}}
|
Improve UI on mobile (#19546)
Start making the mobile experience not painful and be actually usable. This contains a few smaller changes to enhance this experience.
- Submit buttons on the review forms aren't columns anymore and are now allowed to be displayed on one row.
- The label/milestone & New Issue buttons were given each own row even tough, there's enough place to do it one the same row. This commit fixes that.
- The issues+Pull tab on repo's has a third item besides the label/milestone & New Issue buttons, the search bar. On desktop there's enough place to do this on one row, for mobile it isn't, currently it was using for each item a new row. This commits fixes that by only giving the searchbar a new row and have the other two buttons on the same row.
- The notification table will now be show a scrollbar instead of overflow.
- The repo buttons(Watch, Star, Fork) on mobile were showing quite big and the SVG wasn't even displayed on the same line, if the count of those numbers were too high it would even overflow. This commit removes the SVG, as there isn't any place to show them on the same row and allows them to have a new row if the counts of those buttons are high.
- The admin page can show you a lot of interesting information, on mobile the System Status + Configuration weren't properly displayed as the margin's were too high. This commit fixes that by reducing the margin to a number that makes sense on mobile.
- Fixes to not overflow the tables but instead force them to be scrollable.
- When viewing a issue or pull request, the comments aren't full-width but instead 80% and aligned to right, on mobile this is a annoyance as there isn't much width to begin with. This commits fixes that by forcing full-width and removing the avatars on the left side and instead including them inline in the comment header.
3 years ago
|
|
|
</a>
|
|
|
|
<span class="text grey">
|
|
|
|
{{template "shared/user/authorlink" .Issue.Poster}}
|
|
|
|
{{.locale.Tr "repo.issues.commented_at" (.Issue.HashTag|Escape) $createdStr | Safe}}
|
|
|
|
</span>
|
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
<div class="comment-header-right actions gt-df gt-ac">
|
|
|
|
{{if gt .Issue.ShowRole 0}}
|
|
|
|
{{if (.Issue.ShowRole.HasRole "Writer")}}
|
Improve UI on mobile (#19546)
Start making the mobile experience not painful and be actually usable. This contains a few smaller changes to enhance this experience.
- Submit buttons on the review forms aren't columns anymore and are now allowed to be displayed on one row.
- The label/milestone & New Issue buttons were given each own row even tough, there's enough place to do it one the same row. This commit fixes that.
- The issues+Pull tab on repo's has a third item besides the label/milestone & New Issue buttons, the search bar. On desktop there's enough place to do this on one row, for mobile it isn't, currently it was using for each item a new row. This commits fixes that by only giving the searchbar a new row and have the other two buttons on the same row.
- The notification table will now be show a scrollbar instead of overflow.
- The repo buttons(Watch, Star, Fork) on mobile were showing quite big and the SVG wasn't even displayed on the same line, if the count of those numbers were too high it would even overflow. This commit removes the SVG, as there isn't any place to show them on the same row and allows them to have a new row if the counts of those buttons are high.
- The admin page can show you a lot of interesting information, on mobile the System Status + Configuration weren't properly displayed as the margin's were too high. This commit fixes that by reducing the margin to a number that makes sense on mobile.
- Fixes to not overflow the tables but instead force them to be scrollable.
- When viewing a issue or pull request, the comments aren't full-width but instead 80% and aligned to right, on mobile this is a annoyance as there isn't much width to begin with. This commits fixes that by forcing full-width and removing the avatars on the left side and instead including them inline in the comment header.
3 years ago
|
|
|
<div class="ui basic label role-label">
|
|
|
|
{{$.locale.Tr "repo.issues.collaborator"}}
|
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
{{if (.Issue.ShowRole.HasRole "Owner")}}
|
Improve UI on mobile (#19546)
Start making the mobile experience not painful and be actually usable. This contains a few smaller changes to enhance this experience.
- Submit buttons on the review forms aren't columns anymore and are now allowed to be displayed on one row.
- The label/milestone & New Issue buttons were given each own row even tough, there's enough place to do it one the same row. This commit fixes that.
- The issues+Pull tab on repo's has a third item besides the label/milestone & New Issue buttons, the search bar. On desktop there's enough place to do this on one row, for mobile it isn't, currently it was using for each item a new row. This commits fixes that by only giving the searchbar a new row and have the other two buttons on the same row.
- The notification table will now be show a scrollbar instead of overflow.
- The repo buttons(Watch, Star, Fork) on mobile were showing quite big and the SVG wasn't even displayed on the same line, if the count of those numbers were too high it would even overflow. This commit removes the SVG, as there isn't any place to show them on the same row and allows them to have a new row if the counts of those buttons are high.
- The admin page can show you a lot of interesting information, on mobile the System Status + Configuration weren't properly displayed as the margin's were too high. This commit fixes that by reducing the margin to a number that makes sense on mobile.
- Fixes to not overflow the tables but instead force them to be scrollable.
- When viewing a issue or pull request, the comments aren't full-width but instead 80% and aligned to right, on mobile this is a annoyance as there isn't much width to begin with. This commits fixes that by forcing full-width and removing the avatars on the left side and instead including them inline in the comment header.
3 years ago
|
|
|
<div class="ui basic label role-label">
|
|
|
|
{{$.locale.Tr "repo.issues.owner"}}
|
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
{{end}}
|
|
|
|
{{if not $.Repository.IsArchived}}
|
|
|
|
{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index)}}
|
|
|
|
{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" .Issue "delete" false "issue" true "diff" false "IsCommentPoster" $.IsIssuePoster}}
|
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="ui attached segment comment-body" role="article">
|
|
|
|
<div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission $.IsIssuePoster}}data-can-edit="true"{{end}}>
|
|
|
|
{{if .Issue.RenderedContent}}
|
|
|
|
{{.Issue.RenderedContent|Str2html}}
|
|
|
|
{{else}}
|
|
|
|
<span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span>
|
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
<div id="issue-{{.Issue.ID}}-raw" class="raw-content gt-hidden">{{.Issue.Content}}</div>
|
|
|
|
<div class="edit-content-zone gt-hidden" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/content" data-context="{{.RepoLink}}" data-attachment-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/attachments" data-view-attachment-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/view-attachments"></div>
|
|
|
|
{{if .Issue.Attachments}}
|
|
|
|
{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Issue.Attachments "Content" .Issue.RenderedContent}}
|
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
{{$reactions := .Issue.Reactions.GroupByType}}
|
|
|
|
{{if $reactions}}
|
|
|
|
<div class="ui attached segment reactions" role="note">
|
|
|
|
{{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index) "Reactions" $reactions}}
|
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
{{template "repo/issue/view_content/comments" .}}
|
|
|
|
|
|
|
|
{{if and .Issue.IsPull (not $.Repository.IsArchived)}}
|
|
|
|
{{template "repo/issue/view_content/pull".}}
|
|
|
|
{{end}}
|
|
|
|
|
|
|
|
{{if .IsSigned}}
|
|
|
|
{{if and (or .IsRepoAdmin .HasIssuesOrPullsWritePermission (not .Issue.IsLocked)) (not .Repository.IsArchived)}}
|
|
|
|
<div class="timeline-item comment form">
|
|
|
|
<a class="timeline-avatar" href="{{.SignedUser.HomeLink}}">
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
{{avatar $.Context .SignedUser}}
|
|
|
|
</a>
|
|
|
|
<div class="content">
|
|
|
|
<form class="ui segment form" id="comment-form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/comments" method="post">
|
|
|
|
{{template "repo/issue/comment_tab" .}}
|
|
|
|
{{.CsrfTokenHtml}}
|
|
|
|
<input id="status" name="status" type="hidden">
|
|
|
|
<div class="field footer">
|
|
|
|
<div class="text right">
|
|
|
|
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}}
|
|
|
|
{{if .Issue.IsClosed}}
|
|
|
|
<button id="status-button" class="ui green basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.reopen_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.reopen_comment_issue"}}" data-status-val="reopen">
|
|
|
|
{{.locale.Tr "repo.issues.reopen_issue"}}
|
|
|
|
</button>
|
|
|
|
{{else}}
|
|
|
|
{{$closeTranslationKey := "repo.issues.close"}}
|
|
|
|
{{if .Issue.IsPull}}
|
|
|
|
{{$closeTranslationKey = "repo.pulls.close"}}
|
|
|
|
{{end}}
|
|
|
|
<button id="status-button" class="ui red basic button" tabindex="6" data-status="{{.locale.Tr $closeTranslationKey}}" data-status-and-comment="{{.locale.Tr "repo.issues.close_comment_issue"}}" data-status-val="close">
|
|
|
|
{{.locale.Tr $closeTranslationKey}}
|
|
|
|
</button>
|
|
|
|
{{end}}
|
|
|
|
{{end}}
|
|
|
|
<button class="ui green button loading-button" tabindex="5">
|
|
|
|
{{.locale.Tr "repo.issues.create_comment"}}
|
|
|
|
</button>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</form>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
{{else if .Repository.IsArchived}}
|
|
|
|
<div class="ui warning message">
|
|
|
|
{{if .Issue.IsPull}}
|
|
|
|
{{.locale.Tr "repo.archive.pull.nocomment"}}
|
|
|
|
{{else}}
|
|
|
|
{{.locale.Tr "repo.archive.issue.nocomment"}}
|
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
{{else}} {{/* not .IsSigned */}}
|
|
|
|
{{if .Repository.IsArchived}}
|
|
|
|
<div class="ui warning message">
|
|
|
|
{{if .Issue.IsPull}}
|
|
|
|
{{.locale.Tr "repo.archive.pull.nocomment"}}
|
|
|
|
{{else}}
|
|
|
|
{{.locale.Tr "repo.archive.issue.nocomment"}}
|
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
{{else}}
|
|
|
|
<div class="ui warning message">
|
|
|
|
{{.locale.Tr "repo.issues.sign_in_require_desc" (.SignInLink|Escape) | Safe}}
|
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
{{end}}{{/* end if: .IsSigned */}}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
{{template "repo/issue/view_content/sidebar" .}}
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<template id="issue-comment-editor-template">
|
|
|
|
<div class="ui comment form">
|
|
|
|
<div class="field">
|
|
|
|
{{template "shared/combomarkdowneditor" (dict
|
|
|
|
"locale" $.locale
|
|
|
|
"MarkdownPreviewUrl" (print .Repository.Link "/markup")
|
|
|
|
"MarkdownPreviewContext" .RepoLink
|
|
|
|
"TextareaName" "content"
|
|
|
|
"DropzoneParentContainer" ".ui.form"
|
|
|
|
)}}
|
|
|
|
</div>
|
|
|
|
|
|
|
|
{{if .IsAttachmentEnabled}}
|
|
|
|
<div class="field">
|
|
|
|
{{template "repo/upload" .}}
|
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
|
|
|
|
<div class="field">
|
|
|
|
<div class="text right edit">
|
|
|
|
<button class="ui basic secondary cancel button" tabindex="3">{{.locale.Tr "repo.issues.cancel"}}</button>
|
|
|
|
<button class="ui primary save button" tabindex="2">{{.locale.Tr "repo.issues.save"}}</button>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</template>
|
|
|
|
|
|
|
|
{{template "repo/issue/view_content/reference_issue_dialog" .}}
|
|
|
|
|
|
|
|
<div class="gt-hidden" id="no-content">
|
|
|
|
<span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="ui g-modal-confirm delete modal">
|
|
|
|
<div class="header">
|
|
|
|
{{svg "octicon-trash"}}
|
|
|
|
{{.locale.Tr "repo.branch.delete" .HeadTarget}}
|
|
|
|
</div>
|
|
|
|
<div class="content">
|
|
|
|
<p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
|
|
|
|
</div>
|
|
|
|
{{template "base/modal_actions_confirm" .}}
|
|
|
|
</div>
|