revert

Author: wxiaoguang

custom/conf/app.example.ini

@@ -1357,9 +1357,6 @@ LEVEL = Info
 ;; Number of orgs that are displayed on profile page
 ;ORG_PAGING_NUM = 15
 
-;; Whether to show the pagination on the user dashbaord page
-;DASHBOARD_ACTIVITIES_PAGINATION = false
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;[ui.meta]

modules/setting/ui.go

@@ -63,9 +63,8 @@ var UI = struct {
 		OrgPagingNum    int
 	} `ini:"ui.admin"`
 	User struct {
-		RepoPagingNum                 int
-		OrgPagingNum                  int
-		DashboardActivitiesPagination bool // display pagination for dashboard activities
+		RepoPagingNum int
+		OrgPagingNum  int
 	} `ini:"ui.user"`
 	Meta struct {
 		Author      string
@@ -130,13 +129,11 @@ var UI = struct {
 		OrgPagingNum:    50,
 	},
 	User: struct {
-		RepoPagingNum                 int
-		OrgPagingNum                  int
-		DashboardActivitiesPagination bool
+		RepoPagingNum int
+		OrgPagingNum  int
 	}{
-		RepoPagingNum:                 15,
-		OrgPagingNum:                  15,
-		DashboardActivitiesPagination: false,
+		RepoPagingNum: 15,
+		OrgPagingNum:  15,
 	},
 	Meta: struct {
 		Author      string

routers/web/user/home.go

@@ -142,7 +142,6 @@ func Dashboard(ctx *context.Context) {
 	pager := context.NewPagination(int(count), setting.UI.FeedPagingNum, page, 5)
 	pager.AddParamFromRequest(ctx.Req)
 	ctx.Data["Page"] = pager
-	ctx.Data["ShowPagination"] = setting.UI.User.DashboardActivitiesPagination
 
 	ctx.HTML(http.StatusOK, tplDashboard)
 }

templates/base/pre_next.tmpl

@@ -126,12 +126,5 @@
 			</div>
 		</div>
 	{{end}}
-	{{$paginater := .Page.Paginater}}
-	{{if $paginater}}
-		{{if .ShowPagination}}
-			{{template "base/paginate" .}}
-		{{else}}
-			{{template "base/pre_next" .}}
-		{{end}}
-	{{end}}
+	{{template "base/paginate" .}}
 </div>