bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-06 02:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename constants of package gpage from skake to upper camel case

Browse Source
This commit is contained in:
John Guo
2021-06-26 17:00:32 +08:00
parent 91ca79b300
commit 859ea150ed
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net/ghttp/ghttp_request_param_page.go
View File

@ -14,7 +14,7 @@ import (
)
// GetPage creates and returns the pagination object for given <totalSize> and <pageSize>.
// NOTE THAT the page parameter name from client is constantly defined as gpage.PAGE_NAME
// NOTE THAT the page parameter name from client is constantly defined as gpage.DefaultPageName
// for simplification and convenience.
func (r *Request) GetPage(totalSize, pageSize int) *gpage.Page {
// It must has Router object attribute.
@ -27,7 +27,7 @@ func (r *Request) GetPage(totalSize, pageSize int) *gpage.Page {
// Check the page variable in the URI.
if len(r.Router.RegNames) > 0 {
for _, name := range r.Router.RegNames {
if name == gpage.PAGE_NAME {
if name == gpage.DefaultPageName {
uriHasPageName = true
break
}
@ -38,8 +38,8 @@ func (r *Request) GetPage(totalSize, pageSize int) *gpage.Page {
urlTemplate = r.Router.Uri
for i, name := range r.Router.RegNames {
rule := fmt.Sprintf(`[:\*]%s|\{%s\}`, name, name)
if name == gpage.PAGE_NAME {
urlTemplate, _ = gregex.ReplaceString(rule, gpage.PAGE_PLACE_HOLDER, urlTemplate)
if name == gpage.DefaultPageName {
urlTemplate, _ = gregex.ReplaceString(rule, gpage.DefaultPagePlaceHolder, urlTemplate)
} else {
urlTemplate, _ = gregex.ReplaceString(rule, match[i+1], urlTemplate)
}
@ -51,7 +51,7 @@ func (r *Request) GetPage(totalSize, pageSize int) *gpage.Page {
// Check the page variable in the query string.
if !uriHasPageName {
values := url.Query()
values.Set(gpage.PAGE_NAME, gpage.PAGE_PLACE_HOLDER)
values.Set(gpage.DefaultPageName, gpage.DefaultPagePlaceHolder)
url.RawQuery = values.Encode()
// Replace the encoded "{.page}" to original "{.page}".
url.RawQuery = gstr.Replace(url.RawQuery, "%7B.page%7D", "{.page}")
@ -60,5 +60,5 @@ func (r *Request) GetPage(totalSize, pageSize int) *gpage.Page {
urlTemplate += "?" + url.RawQuery
}
return gpage.New(totalSize, pageSize, r.GetInt(gpage.PAGE_NAME), urlTemplate)
return gpage.New(totalSize, pageSize, r.GetInt(gpage.DefaultPageName), urlTemplate)
}

6
util/gpage/gpage.go
View File

@ -35,8 +35,8 @@ type Page struct {
}
const (
PAGE_NAME = "page" // PAGE_NAME defines the default page name.
PAGE_PLACE_HOLDER = "{.page}" // PAGE_PLACE_HOLDER defines the place holder for the url template.
DefaultPageName = "page" // DefaultPageName defines the default page name.
DefaultPagePlaceHolder = "{.page}" // DefaultPagePlaceHolder defines the place holder for the url template.
)
// New creates and returns a pagination manager.
@ -206,7 +206,7 @@ func (p *Page) GetContent(mode int) string {
// Note that the UrlTemplate attribute can be either an URL or a URI string with "{.page}"
// place holder specifying the page number position.
func (p *Page) GetUrl(page int) string {
return gstr.Replace(p.UrlTemplate, PAGE_PLACE_HOLDER, gconv.String(page))
return gstr.Replace(p.UrlTemplate, DefaultPagePlaceHolder, gconv.String(page))
}
// GetLink returns the HTML link tag `a` content for given page number.