@@ -13,7 +13,6 @@ import (
13
13
"code.gitea.io/gitea/models/organization"
14
14
repo_model "code.gitea.io/gitea/models/repo"
15
15
"code.gitea.io/gitea/modules/base"
16
- "code.gitea.io/gitea/modules/git"
17
16
"code.gitea.io/gitea/modules/log"
18
17
"code.gitea.io/gitea/modules/markup"
19
18
"code.gitea.io/gitea/modules/markup/markdown"
@@ -42,6 +41,14 @@ func Home(ctx *context.Context) {
42
41
return
43
42
}
44
43
44
+ home (ctx , false )
45
+ }
46
+
47
+ func Repositories (ctx * context.Context ) {
48
+ home (ctx , true )
49
+ }
50
+
51
+ func home (ctx * context.Context , viewRepositories bool ) {
45
52
org := ctx .Org .Organization
46
53
47
54
ctx .Data ["PageIsUserProfile" ] = true
@@ -101,10 +108,34 @@ func Home(ctx *context.Context) {
101
108
private := ctx .FormOptionalBool ("private" )
102
109
ctx .Data ["IsPrivate" ] = private
103
110
111
+ err := shared_user .LoadHeaderCount (ctx )
112
+ if err != nil {
113
+ ctx .ServerError ("LoadHeaderCount" , err )
114
+ return
115
+ }
116
+
117
+ opts := & organization.FindOrgMembersOpts {
118
+ OrgID : org .ID ,
119
+ PublicOnly : ctx .Org .PublicMemberOnly ,
120
+ ListOptions : db.ListOptions {Page : 1 , PageSize : 25 },
121
+ }
122
+ members , _ , err := organization .FindOrgMembers (ctx , opts )
123
+ if err != nil {
124
+ ctx .ServerError ("FindOrgMembers" , err )
125
+ return
126
+ }
127
+ ctx .Data ["Members" ] = members
128
+ ctx .Data ["Teams" ] = ctx .Org .Teams
129
+ ctx .Data ["DisableNewPullMirrors" ] = setting .Mirror .DisableNewPull
130
+ ctx .Data ["ShowMemberAndTeamTab" ] = ctx .Org .IsMember || len (members ) > 0
131
+
132
+ if ! prepareOrgProfileReadme (ctx , viewRepositories ) {
133
+ ctx .Data ["PageIsViewRepositories" ] = true
134
+ }
135
+
104
136
var (
105
137
repos []* repo_model.Repository
106
138
count int64
107
- err error
108
139
)
109
140
repos , count , err = repo_model .SearchRepository (ctx , & repo_model.SearchRepoOptions {
110
141
ListOptions : db.ListOptions {
@@ -129,29 +160,8 @@ func Home(ctx *context.Context) {
129
160
return
130
161
}
131
162
132
- opts := & organization.FindOrgMembersOpts {
133
- OrgID : org .ID ,
134
- PublicOnly : ctx .Org .PublicMemberOnly ,
135
- ListOptions : db.ListOptions {Page : 1 , PageSize : 25 },
136
- }
137
- members , _ , err := organization .FindOrgMembers (ctx , opts )
138
- if err != nil {
139
- ctx .ServerError ("FindOrgMembers" , err )
140
- return
141
- }
142
-
143
163
ctx .Data ["Repos" ] = repos
144
164
ctx .Data ["Total" ] = count
145
- ctx .Data ["Members" ] = members
146
- ctx .Data ["Teams" ] = ctx .Org .Teams
147
- ctx .Data ["DisableNewPullMirrors" ] = setting .Mirror .DisableNewPull
148
- ctx .Data ["PageIsViewRepositories" ] = true
149
-
150
- err = shared_user .LoadHeaderCount (ctx )
151
- if err != nil {
152
- ctx .ServerError ("LoadHeaderCount" , err )
153
- return
154
- }
155
165
156
166
pager := context .NewPagination (int (count ), setting .UI .User .RepoPagingNum , page , 5 )
157
167
pager .SetDefaultParams (ctx )
@@ -173,18 +183,16 @@ func Home(ctx *context.Context) {
173
183
}
174
184
ctx .Data ["Page" ] = pager
175
185
176
- ctx .Data ["ShowMemberAndTeamTab" ] = ctx .Org .IsMember || len (members ) > 0
177
-
178
- profileDbRepo , profileGitRepo , profileReadmeBlob , profileClose := shared_user .FindUserProfileReadme (ctx , ctx .Doer )
179
- defer profileClose ()
180
- prepareOrgProfileReadme (ctx , profileGitRepo , profileDbRepo , profileReadmeBlob )
181
-
182
186
ctx .HTML (http .StatusOK , tplOrgHome )
183
187
}
184
188
185
- func prepareOrgProfileReadme (ctx * context.Context , profileGitRepo * git.Repository , profileDbRepo * repo_model.Repository , profileReadme * git.Blob ) {
186
- if profileGitRepo == nil || profileReadme == nil {
187
- return
189
+ func prepareOrgProfileReadme (ctx * context.Context , viewRepositories bool ) bool {
190
+ profileDbRepo , profileGitRepo , profileReadme , profileClose := shared_user .FindUserProfileReadme (ctx , ctx .Doer )
191
+ defer profileClose ()
192
+ ctx .Data ["HasProfileReadme" ] = profileReadme != nil
193
+
194
+ if profileGitRepo == nil || profileReadme == nil || viewRepositories {
195
+ return false
188
196
}
189
197
190
198
if bytes , err := profileReadme .GetBlobContent (setting .UI .MaxDisplayFileSize ); err != nil {
@@ -206,4 +214,7 @@ func prepareOrgProfileReadme(ctx *context.Context, profileGitRepo *git.Repositor
206
214
ctx .Data ["ProfileReadme" ] = profileContent
207
215
}
208
216
}
217
+
218
+ ctx .Data ["PageIsViewOverview" ] = true
219
+ return true
209
220
}
0 commit comments