Commit @190e24e3efee28444d4bfe32773e8c7068c82f3a

[Notice] Announcing the End of Demo Server [Read me]

DeokHong Kim (a.k.a insanehong) 2013-10-28

codehistroy:fixed link on list button at code diff view

@190e24e3efee28444d4bfe32773e8c7068c82f3a

bb621a3

190e24e

app/assets/stylesheets/less/_page.less

--- app/assets/stylesheets/less/_page.less

+++ app/assets/stylesheets/less/_page.less


         width: 40px;
     }
     .filename { float:left; line-height:30px; }
+    
+    .hide {
+        display:none;
+    }
 }
 
 div.diff-body[data-outdated="true"] tr:hover .icon-comment {
     visibility: hidden;
-}
+}

bb621a3

190e24e

app/controllers/CodeHistoryApp.java

--- app/controllers/CodeHistoryApp.java

+++ app/controllers/CodeHistoryApp.java


 import models.enumeration.Operation;
 
 import models.enumeration.ResourceType;
+import org.apache.commons.lang.StringUtils;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.NoHeadException;
 import org.tmatesoft.svn.core.SVNException;

         List<CommitComment> comments = CommitComment.find.where().eq("commitId",
                 commitId).eq("project.id", project.id).findList();
 
+        String selectedBranch = StringUtils.defaultIfBlank(request().getQueryString("branch"), "HEAD");
+        String path = StringUtils.defaultIfBlank(request().getQueryString("path"), "");
+
         if(project.vcs.equals(RepositoryService.VCS_SUBVERSION)) {
             String patch = repository.getPatch(commitId);
 

                 return notFound(ErrorViews.NotFound.render("error.notfound", project));
             }
 
-            String selectedBranch = request().getQueryString("branch");
-
-            return ok(svnDiff.render(project, commit, parentCommit, patch, comments, selectedBranch));
+            return ok(svnDiff.render(project, commit, parentCommit, patch, comments, selectedBranch, path));
         } else {
             List<FileDiff> fileDiffs = repository.getDiff(commitId);
 

                 return notFound(ErrorViews.NotFound.render("error.notfound", project));
             }
 
-            String selectedBranch = request().getQueryString("branch");
-
-            return ok(diff.render(project, commit, parentCommit, comments, selectedBranch, fileDiffs));
+            return ok(diff.render(project, commit, parentCommit, comments, selectedBranch, fileDiffs, path));
         }
     }
 

bb621a3

190e24e

app/views/code/diff.scala.html

--- app/views/code/diff.scala.html

+++ app/views/code/diff.scala.html


-@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, comments:List[CommitComment], selectedBranch:String, diff: List[playRepository.FileDiff])
+@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, comments:List[CommitComment], selectedBranch:String, diff: List[playRepository.FileDiff],path:String)
 
 @import playRepository.RepositoryService
 @import java.net.URLEncoder

     <div class="code-browse-wrap">
         <div id="branches" class="btn-group branches pull-right" data-name="branch" data-activate="manual">
             <button class="btn dropdown-toggle large" data-toggle="dropdown">
-                <span class="d-label">@if(selectedBranch){ @selectedBranch } else { HEAD }</span>
+                <span class="d-label">@selectedBranch</span>
                 <span class="d-caret"><span class="caret"></span></span>
             </button>
             <ul class="dropdown-menu">

 
     <button id="watch-button" type="button" class="ybtn @if(commit.getWatchers(project).contains(UserApp.currentUser())) { active ybtn-watching }" data-toggle="button">@Messages("notification.watch")</button>
 
-    <a href="javascript: history.back();" class="ybtn pull-right">@Messages("button.list")</a>
+    <a href="@routes.CodeHistoryApp.history(project.owner, project.name, selectedBranch, path)" class="ybtn pull-right">@Messages("button.list")</a>
 
     <div id="minimap" class="minimap-outer">
         <div class="minimap-wrap">

bb621a3

190e24e

app/views/code/history.scala.html

--- app/views/code/history.scala.html

+++ app/views/code/history.scala.html


         routes.CodeHistoryApp.historyUntilHead(project.owner, project.name)
     }
 }
-@getShowCommitURL(project:Project, commit:playRepository.Commit) = @{
+@getShowCommitURL(project:Project, commit:playRepository.Commit, path:String) = @{
     if(selectedBranch){
-        routes.CodeHistoryApp.show(project.owner, project.name, commit.getId()) + "?branch=" + URLEncoder.encode(selectedBranch, "UTF-8")
+        var queryString = "?branch=" + URLEncoder.encode(selectedBranch, "UTF-8");
+        if(path != null) {
+            queryString += "&path=" + path;
+        }
+        routes.CodeHistoryApp.show(project.owner, project.name, commit.getId()) + queryString;
     } else {
         routes.CodeHistoryApp.show(project.owner, project.name, commit.getId())
     }

                     </thead>
                     <tbody class="tbody">
                         @for(commit <- history.iterator()) {
-                        @defining(getShowCommitURL(project, commit)){ showCommitURL =>
+                        @defining(getShowCommitURL(project, commit, path)){ showCommitURL =>
                         <tr>
                             <td class="commit-id">
-                                <a href="@showCommitURL#@path" title="@Messages("code.showCommit")">
+                                <a href="@showCommitURL" title="@Messages("code.showCommit")">
                                     @commit.getShortId()
                                 </a>
                             </td>
                             <td class="messages">
-                                @defining(CommitComment.count(project, commit.getId, if(path != null){"/"+path}else{null})){ numOfComment =>
+                                @defining(CommitComment.count(project, commit.getId, path)){ numOfComment =>
                                 @if(numOfComment > 0) {
                                 <span class="number-of-comments"><i class="yobicon-comments"></i> @numOfComment</span>
                                 }

                                 @if(commitMsg.startsWith("Merge pull request")){
                                     @defining(commitMsg.split(" ")(3)) { pullRequestIdPart =>
                                         @defining(pullRequestIdPart.replace("#", "").toLong) { pullRequestId =>
-                                        <a href="@showCommitURL#@path">
+                                        <a href="@showCommitURL">
                                             @defining(commitMsg.indexOf(" #")) { indexOfPullRequestStart =>
                                                 @commitMsg.split("\n")(0).substring(0, indexOfPullRequestStart)
                                             }

                                         <a href="@routes.PullRequestApp.pullRequest(project.owner, project.name, pullRequestId)" class="secondary-txt">
                                             #@pullRequestId
                                         </a>
-                                        <a href="@showCommitURL#@path">
+                                        <a href="@showCommitURL">
                                             @defining(commitMsg.indexOf(commitMsg.split(" ")(3)) + commitMsg.split(" ")(3).length) { indexOfPullRequestIdEnd =>
                                             @commitMsg.split("\n")(0).substring(indexOfPullRequestIdEnd)
                                             }

                                         }
                                     }
                                 } else {
-                                    <a href="@showCommitURL#@path">@commitMsg.split("\n")(0)</a>
+                                    <a href="@showCommitURL">@commitMsg.split("\n")(0)</a>
                                 }
 
                                 @if(commitMsg.split("\n").length > 1){

bb621a3

190e24e

app/views/code/svnDiff.scala.html

--- app/views/code/svnDiff.scala.html

+++ app/views/code/svnDiff.scala.html


-@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CommitComment], selectedBranch:String)
+@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CommitComment], selectedBranch:String, path:String)
 
 @import playRepository.RepositoryService
 @import java.net.URLEncoder

         </p>
         <pre class="commitMsg">@commit.getMessage</pre>
         <div class="diff-wrap">
-            <div id="commit" class="diff-body show-comments">@patch</div>
+            <div id="commit" data-commit-origin="true" class="diff-body show-comments hide">@patch</div>
         </div>
         <div id="compare" class="modal hide compare-wrap" tabindex="-1" role="dialog">
             <h4 class="path">

 
     <button id="watch-button" type="button" class="ybtn @if(commit.getWatchers(project).contains(UserApp.currentUser())) { active }" data-toggle="button">@Messages("notification.watch")</button>
 
-    <a href="javascript: history.back();" class="ybtn pull-right">@Messages("button.list")</a>
+    <a href="@routes.CodeHistoryApp.history(project.owner, project.name, selectedBranch, path)" class="ybtn pull-right">@Messages("button.list")</a>
 
     <div id="minimap" class="minimap-outer">
         <div class="minimap-wrap">

bb621a3

190e24e

public/javascripts/service/yobi.code.SvnDiff.js

--- public/javascripts/service/yobi.code.SvnDiff.js

+++ public/javascripts/service/yobi.code.SvnDiff.js


             htVar.sTplMiniMapLink = '<a href="#${id}" style="top:${top}px; height:${height}px;"></a>';
             
             // yobi.Attachments
-            htVar.sTplFileItem = ('#tplAttachedFile').text();
+            htVar.sTplFileItem = $('#tplAttachedFile').text();
         }
 
         /**

                     window.scrollTo(0, welTarget.offset().top);
                 }
             }
+
+            $('[data-commit-origin="true"]').removeClass("hide");
         }
 
         /**

Add a comment

Open 0
Closed 0

List

...	...	@@ -4577,8 +4577,12 @@
4577	4577	width: 40px;
4578	4578	}
4579	4579	.filename { float:left; line-height:30px; }
	4580	+
	4581	+ .hide {
	4582	+ display:none;
	4583	+ }
4580	4584	}
4581	4585
4582	4586	div.diff-body[data-outdated="true"] tr:hover .icon-comment {
4583	4587	visibility: hidden;
4584		-}
	4588	+} (No newline at end of file)

...	...	@@ -12,6 +12,7 @@
12	12	import models.enumeration.Operation;
13	13
14	14	import models.enumeration.ResourceType;
	15	+import org.apache.commons.lang.StringUtils;
15	16	import org.eclipse.jgit.api.errors.GitAPIException;
16	17	import org.eclipse.jgit.api.errors.NoHeadException;
17	18	import org.tmatesoft.svn.core.SVNException;
...	...	@@ -156,6 +157,9 @@
156	157	List<CommitComment> comments = CommitComment.find.where().eq("commitId",
157	158	commitId).eq("project.id", project.id).findList();
158	159
	160	+ String selectedBranch = StringUtils.defaultIfBlank(request().getQueryString("branch"), "HEAD");
	161	+ String path = StringUtils.defaultIfBlank(request().getQueryString("path"), "");
	162	+
159	163	if(project.vcs.equals(RepositoryService.VCS_SUBVERSION)) {
160	164	String patch = repository.getPatch(commitId);
161	165
...	...	@@ -163,9 +167,7 @@
163	167	return notFound(ErrorViews.NotFound.render("error.notfound", project));
164	168	}
165	169
166		- String selectedBranch = request().getQueryString("branch");
167		-
168		- return ok(svnDiff.render(project, commit, parentCommit, patch, comments, selectedBranch));
	170	+ return ok(svnDiff.render(project, commit, parentCommit, patch, comments, selectedBranch, path));
169	171	} else {
170	172	List<FileDiff> fileDiffs = repository.getDiff(commitId);
171	173
...	...	@@ -173,9 +175,7 @@
173	175	return notFound(ErrorViews.NotFound.render("error.notfound", project));
174	176	}
175	177
176		- String selectedBranch = request().getQueryString("branch");
177		-
178		- return ok(diff.render(project, commit, parentCommit, comments, selectedBranch, fileDiffs));
	178	+ return ok(diff.render(project, commit, parentCommit, comments, selectedBranch, fileDiffs, path));
179	179	}
180	180	}
181	181

...	...	@@ -1,4 +1,4 @@
1		-@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, comments:List[CommitComment], selectedBranch:String, diff: List[playRepository.FileDiff])
	1	+@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, comments:List[CommitComment], selectedBranch:String, diff: List[playRepository.FileDiff],path:String)
2	2
3	3	@import playRepository.RepositoryService
4	4	@import java.net.URLEncoder
...	...	@@ -14,7 +14,7 @@
14	14	<div class="code-browse-wrap">
15	15	<div id="branches" class="btn-group branches pull-right" data-name="branch" data-activate="manual">
16	16	<button class="btn dropdown-toggle large" data-toggle="dropdown">
17		- <span class="d-label">@if(selectedBranch){ @selectedBranch } else { HEAD }</span>
	17	+ <span class="d-label">@selectedBranch</span>
18	18	<span class="d-caret"><span class="caret"></span></span>
19	19	</button>
20	20	<ul class="dropdown-menu">
...	...	@@ -129,7 +129,7 @@
129	129
130	130	<button id="watch-button" type="button" class="ybtn @if(commit.getWatchers(project).contains(UserApp.currentUser())) { active ybtn-watching }" data-toggle="button">@Messages("notification.watch")</button>
131	131
132		- <a href="javascript: history.back();" class="ybtn pull-right">@Messages("button.list")</a>
	132	+ <a href="@routes.CodeHistoryApp.history(project.owner, project.name, selectedBranch, path)" class="ybtn pull-right">@Messages("button.list")</a>
133	133
134	134	<div id="minimap" class="minimap-outer">
135	135	<div class="minimap-wrap">

...	...	@@ -22,9 +22,13 @@
22	22	routes.CodeHistoryApp.historyUntilHead(project.owner, project.name)
23	23	}
24	24	}
25		-@getShowCommitURL(project:Project, commit:playRepository.Commit) = @{
	25	+@getShowCommitURL(project:Project, commit:playRepository.Commit, path:String) = @{
26	26	if(selectedBranch){
27		- routes.CodeHistoryApp.show(project.owner, project.name, commit.getId()) + "?branch=" + URLEncoder.encode(selectedBranch, "UTF-8")
	27	+ var queryString = "?branch=" + URLEncoder.encode(selectedBranch, "UTF-8");
	28	+ if(path != null) {
	29	+ queryString += "&path=" + path;
	30	+ }
	31	+ routes.CodeHistoryApp.show(project.owner, project.name, commit.getId()) + queryString;
28	32	} else {
29	33	routes.CodeHistoryApp.show(project.owner, project.name, commit.getId())
30	34	}
...	...	@@ -105,15 +109,15 @@
105	109	</thead>
106	110	<tbody class="tbody">
107	111	@for(commit <- history.iterator()) {
108		- @defining(getShowCommitURL(project, commit)){ showCommitURL =>
	112	+ @defining(getShowCommitURL(project, commit, path)){ showCommitURL =>
109	113	<tr>
110	114	<td class="commit-id">
111		- <a href="@showCommitURL#@path" title="@Messages("code.showCommit")">
	115	+ <a href="@showCommitURL" title="@Messages("code.showCommit")">
112	116	@commit.getShortId()
113	117	</a>
114	118	</td>
115	119	<td class="messages">
116		- @defining(CommitComment.count(project, commit.getId, if(path != null){"/"+path}else{null})){ numOfComment =>
	120	+ @defining(CommitComment.count(project, commit.getId, path)){ numOfComment =>
117	121	@if(numOfComment > 0) {
118	122	<span class="number-of-comments"><i class="yobicon-comments"></i> @numOfComment</span>
119	123	}
...	...	@@ -123,7 +127,7 @@
123	127	@if(commitMsg.startsWith("Merge pull request")){
124	128	@defining(commitMsg.split(" ")(3)) { pullRequestIdPart =>
125	129	@defining(pullRequestIdPart.replace("#", "").toLong) { pullRequestId =>
126		- <a href="@showCommitURL#@path">
	130	+ <a href="@showCommitURL">
127	131	@defining(commitMsg.indexOf(" #")) { indexOfPullRequestStart =>
128	132	@commitMsg.split("\n")(0).substring(0, indexOfPullRequestStart)
129	133	}
...	...	@@ -131,7 +135,7 @@
131	135	<a href="@routes.PullRequestApp.pullRequest(project.owner, project.name, pullRequestId)" class="secondary-txt">
132	136	#@pullRequestId
133	137	</a>
134		- <a href="@showCommitURL#@path">
	138	+ <a href="@showCommitURL">
135	139	@defining(commitMsg.indexOf(commitMsg.split(" ")(3)) + commitMsg.split(" ")(3).length) { indexOfPullRequestIdEnd =>
136	140	@commitMsg.split("\n")(0).substring(indexOfPullRequestIdEnd)
137	141	}
...	...	@@ -139,7 +143,7 @@
139	143	}
140	144	}
141	145	} else {
142		- <a href="@showCommitURL#@path">@commitMsg.split("\n")(0)</a>
	146	+ <a href="@showCommitURL">@commitMsg.split("\n")(0)</a>
143	147	}
144	148
145	149	@if(commitMsg.split("\n").length > 1){

...	...	@@ -1,4 +1,4 @@
1		-@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CommitComment], selectedBranch:String)
	1	+@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CommitComment], selectedBranch:String, path:String)
2	2
3	3	@import playRepository.RepositoryService
4	4	@import java.net.URLEncoder
...	...	@@ -91,7 +91,7 @@
91	91	</p>
92	92	<pre class="commitMsg">@commit.getMessage</pre>
93	93	<div class="diff-wrap">
94		- <div id="commit" class="diff-body show-comments">@patch</div>
	94	+ <div id="commit" data-commit-origin="true" class="diff-body show-comments hide">@patch</div>
95	95	</div>
96	96	<div id="compare" class="modal hide compare-wrap" tabindex="-1" role="dialog">
97	97	<h4 class="path">
...	...	@@ -148,7 +148,7 @@
148	148
149	149	<button id="watch-button" type="button" class="ybtn @if(commit.getWatchers(project).contains(UserApp.currentUser())) { active }" data-toggle="button">@Messages("notification.watch")</button>
150	150
151		- <a href="javascript: history.back();" class="ybtn pull-right">@Messages("button.list")</a>
	151	+ <a href="@routes.CodeHistoryApp.history(project.owner, project.name, selectedBranch, path)" class="ybtn pull-right">@Messages("button.list")</a>
152	152
153	153	<div id="minimap" class="minimap-outer">
154	154	<div class="minimap-wrap">

...	...	@@ -50,7 +50,7 @@
50	50	htVar.sTplMiniMapLink = '<a href="#${id}" style="top:${top}px; height:${height}px;"></a>';
51	51
52	52	// yobi.Attachments
53		- htVar.sTplFileItem = ('#tplAttachedFile').text();
	53	+ htVar.sTplFileItem = $('#tplAttachedFile').text();
54	54	}
55	55
56	56	/**
...	...	@@ -134,6 +134,8 @@
134	134	window.scrollTo(0, welTarget.offset().top);
135	135	}
136	136	}
	137	+
	138	+ $('[data-commit-origin="true"]').removeClass("hide");
137	139	}
138	140
139	141	/**

Delete comment