[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 :)
go-gitea · Aug 26, 2019 · 5409dec · 5409dec
1 parent c9546d4
commit 5409dec
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
@@ -88,8 +88,8 @@
 						<dt>{{.i18n.Tr "admin.config.ssh_minimum_key_size_check"}}</dt>
 						<dd><i class="fa fa{{if .SSH.MinimumKeySizeCheck}}-check{{end}}-square-o"></i></dd>
 						{{if .SSH.MinimumKeySizeCheck}}
-						<dt>{{.i18n.Tr "admin.config.ssh_minimum_key_sizes"}}</dt>
-						<dd>{{.SSH.MinimumKeySizes}}</dd>
+							<dt>{{.i18n.Tr "admin.config.ssh_minimum_key_sizes"}}</dt>
+							<dd>{{.SSH.MinimumKeySizes}}</dd>
 						{{end}}
 					{{end}}
 				{{end}}
@@ -120,20 +120,20 @@
 				<dt>{{.i18n.Tr "admin.config.db_type"}}</dt>
 				<dd>{{.DbCfg.Type}}</dd>
 				{{if not (or (eq .DbCfg.Type "sqlite3") (eq .DbCfg.Type "tidb"))}}
-				<dt>{{.i18n.Tr "admin.config.db_host"}}</dt>
-				<dd>{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}</dd>
-				<dt>{{.i18n.Tr "admin.config.db_name"}}</dt>
-				<dd>{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}</dd>
-				<dt>{{.i18n.Tr "admin.config.db_user"}}</dt>
-				<dd>{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}</dd>
+					<dt>{{.i18n.Tr "admin.config.db_host"}}</dt>
+					<dd>{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}</dd>
+					<dt>{{.i18n.Tr "admin.config.db_name"}}</dt>
+					<dd>{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}</dd>
+					<dt>{{.i18n.Tr "admin.config.db_user"}}</dt>
+					<dd>{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}</dd>
 				{{end}}
 				{{if eq .DbCfg.Type "postgres"}}
-				<dt>{{.i18n.Tr "admin.config.db_ssl_mode"}}</dt>
-				<dd>{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}</dd>
+					<dt>{{.i18n.Tr "admin.config.db_ssl_mode"}}</dt>
+					<dd>{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}</dd>
 				{{end}}
 				{{if or (eq .DbCfg.Type "sqlite3") (eq .DbCfg.Type "tidb")}}
-				<dt>{{.i18n.Tr "admin.config.db_path"}}</dt>
-				<dd>{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}</dd>
+					<dt>{{.i18n.Tr "admin.config.db_path"}}</dt>
+					<dd>{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}</dd>
 				{{end}}
 			</dl>
 		</div>
@@ -250,14 +250,14 @@
 				<dt>{{.i18n.Tr "admin.config.cache_adapter"}}</dt>
 				<dd>{{.CacheAdapter}}</dd>
 				{{if eq .CacheAdapter "memory"}}
-				<dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt>
-				<dd>{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+					<dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt>
+					<dd>{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
 				{{end}}
 				{{if .CacheConn}}
-				<dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt>
-				<dd><code>{{.CacheConn}}</code></dd>
-				<dt>{{.i18n.Tr "admin.config.cache_item_ttl"}}</dt>
-				<dd><code>{{.CacheItemTTL}}</code></dd>
+					<dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt>
+					<dd><code>{{.CacheConn}}</code></dd>
+					<dt>{{.i18n.Tr "admin.config.cache_item_ttl"}}</dt>
+					<dd><code>{{.CacheItemTTL}}</code></dd>
 				{{end}}
 			</dl>
 		</div>

diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
@@ -75,7 +75,7 @@
 									</td>
 									<td class="two wide right aligned">
 										{{if not .LatestPullRequest}}
-											{{if and (not .IsDeleted) $.AllowsPulls}}
+											{{if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}}
 											<a href="{{$.RepoLink}}/compare/{{$.DefaultBranch | EscapePound}}...{{if ne $.Repository.Owner.Name $.Owner.Name}}{{$.Owner.Name}}:{{end}}{{.Name | EscapePound}}">
 												<button id="new-pull-request" class="ui compact basic button">{{$.i18n.Tr "repo.pulls.compare_changes"}}</button>
 											</a>

diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl
@@ -2,8 +2,6 @@
 <div class="repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
-
-
 	  <div id="git-graph-container" class="ui segment">
 		  <h1>{{.i18n.Tr "repo.commit_graph"}}</h1>
 	    <div id="rel-container">
@@ -37,9 +35,6 @@
 	      </ul>
 	    </div>
 	  </div>
-
-
-
 	</div>
 </div>
 {{template "base/footer" .}}