Skip to content

Commit 5409dec

Browse files
6543lafriks
authored andcommitted
[Branch View] show "New Pull Request" Button only if posible (#7977)
* add check Commits Ahead is gt 0 * code format to start drone-ci test again and formate code is also nice :)
1 parent c9546d4 commit 5409dec

File tree

3 files changed

+19
-24
lines changed

3 files changed

+19
-24
lines changed

templates/admin/config.tmpl

+18-18
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
<dt>{{.i18n.Tr "admin.config.ssh_minimum_key_size_check"}}</dt>
8989
<dd><i class="fa fa{{if .SSH.MinimumKeySizeCheck}}-check{{end}}-square-o"></i></dd>
9090
{{if .SSH.MinimumKeySizeCheck}}
91-
<dt>{{.i18n.Tr "admin.config.ssh_minimum_key_sizes"}}</dt>
92-
<dd>{{.SSH.MinimumKeySizes}}</dd>
91+
<dt>{{.i18n.Tr "admin.config.ssh_minimum_key_sizes"}}</dt>
92+
<dd>{{.SSH.MinimumKeySizes}}</dd>
9393
{{end}}
9494
{{end}}
9595
{{end}}
@@ -120,20 +120,20 @@
120120
<dt>{{.i18n.Tr "admin.config.db_type"}}</dt>
121121
<dd>{{.DbCfg.Type}}</dd>
122122
{{if not (or (eq .DbCfg.Type "sqlite3") (eq .DbCfg.Type "tidb"))}}
123-
<dt>{{.i18n.Tr "admin.config.db_host"}}</dt>
124-
<dd>{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}</dd>
125-
<dt>{{.i18n.Tr "admin.config.db_name"}}</dt>
126-
<dd>{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}</dd>
127-
<dt>{{.i18n.Tr "admin.config.db_user"}}</dt>
128-
<dd>{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}</dd>
123+
<dt>{{.i18n.Tr "admin.config.db_host"}}</dt>
124+
<dd>{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}</dd>
125+
<dt>{{.i18n.Tr "admin.config.db_name"}}</dt>
126+
<dd>{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}</dd>
127+
<dt>{{.i18n.Tr "admin.config.db_user"}}</dt>
128+
<dd>{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}</dd>
129129
{{end}}
130130
{{if eq .DbCfg.Type "postgres"}}
131-
<dt>{{.i18n.Tr "admin.config.db_ssl_mode"}}</dt>
132-
<dd>{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}</dd>
131+
<dt>{{.i18n.Tr "admin.config.db_ssl_mode"}}</dt>
132+
<dd>{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}</dd>
133133
{{end}}
134134
{{if or (eq .DbCfg.Type "sqlite3") (eq .DbCfg.Type "tidb")}}
135-
<dt>{{.i18n.Tr "admin.config.db_path"}}</dt>
136-
<dd>{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}</dd>
135+
<dt>{{.i18n.Tr "admin.config.db_path"}}</dt>
136+
<dd>{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}</dd>
137137
{{end}}
138138
</dl>
139139
</div>
@@ -250,14 +250,14 @@
250250
<dt>{{.i18n.Tr "admin.config.cache_adapter"}}</dt>
251251
<dd>{{.CacheAdapter}}</dd>
252252
{{if eq .CacheAdapter "memory"}}
253-
<dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt>
254-
<dd>{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
253+
<dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt>
254+
<dd>{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
255255
{{end}}
256256
{{if .CacheConn}}
257-
<dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt>
258-
<dd><code>{{.CacheConn}}</code></dd>
259-
<dt>{{.i18n.Tr "admin.config.cache_item_ttl"}}</dt>
260-
<dd><code>{{.CacheItemTTL}}</code></dd>
257+
<dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt>
258+
<dd><code>{{.CacheConn}}</code></dd>
259+
<dt>{{.i18n.Tr "admin.config.cache_item_ttl"}}</dt>
260+
<dd><code>{{.CacheItemTTL}}</code></dd>
261261
{{end}}
262262
</dl>
263263
</div>

templates/repo/branch/list.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</td>
7676
<td class="two wide right aligned">
7777
{{if not .LatestPullRequest}}
78-
{{if and (not .IsDeleted) $.AllowsPulls}}
78+
{{if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}}
7979
<a href="{{$.RepoLink}}/compare/{{$.DefaultBranch | EscapePound}}...{{if ne $.Repository.Owner.Name $.Owner.Name}}{{$.Owner.Name}}:{{end}}{{.Name | EscapePound}}">
8080
<button id="new-pull-request" class="ui compact basic button">{{$.i18n.Tr "repo.pulls.compare_changes"}}</button>
8181
</a>

templates/repo/graph.tmpl

-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<div class="repository commits">
33
{{template "repo/header" .}}
44
<div class="ui container">
5-
6-
75
<div id="git-graph-container" class="ui segment">
86
<h1>{{.i18n.Tr "repo.commit_graph"}}</h1>
97
<div id="rel-container">
@@ -37,9 +35,6 @@
3735
</ul>
3836
</div>
3937
</div>
40-
41-
42-
4338
</div>
4439
</div>
4540
{{template "base/footer" .}}

0 commit comments

Comments
 (0)