| author | Piotr Janik | 2011-07-27 06:28:10 (EDT) |
|---|---|---|
| committer | Szymon Brandys | 2011-07-28 05:05:46 (EDT) |
| commit | cd80752f6a06eebb28404ac67e288bab131163af (patch) (side-by-side diff) | |
| tree | 481bd587713a5b231bcc06a2f908a0c49ea80f9b | |
| parent | 8a573cd05d27822913adedd697ffc2c93eae318c (diff) | |
| download | org.eclipse.orion.client-cd80752f6a06eebb28404ac67e288bab131163af.zip org.eclipse.orion.client-cd80752f6a06eebb28404ac67e288bab131163af.tar.gz org.eclipse.orion.client-cd80752f6a06eebb28404ac67e288bab131163af.tar.bz2 | |
Bug 353191 - [client] Git Log should show branches for commits
Change-Id: I21149112935d2e4fb81272c90fb6a6ba4cbf7252
| -rw-r--r-- | bundles/org.eclipse.orion.client.git/web/orion/git/git-commit-navigator.js | 15 | ||||
| -rw-r--r-- | bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/git-commit-navigator.js b/bundles/org.eclipse.orion.client.git/web/orion/git/git-commit-navigator.js index ea678cf..6152ca5 100644 --- a/bundles/org.eclipse.orion.client.git/web/orion/git/git-commit-navigator.js +++ b/bundles/org.eclipse.orion.client.git/web/orion/git/git-commit-navigator.js @@ -135,6 +135,9 @@ exports.GitCommitRenderer = (function() { return dojo.create("th", {style: "padding-left: 5px; padding-right: 5px", innerHTML: "<h2>Actions</h2>"}); break; case 4: + return dojo.create("th", {style: "padding-left: 5px; padding-right: 5px", innerHTML: "<h2>Branches</h2>"}); + break; + case 5: return dojo.create("th", {style: "padding-left: 5px; padding-right: 5px", innerHTML: "<h2>Tags</h2>"}); break; }; @@ -216,7 +219,17 @@ exports.GitCommitRenderer = (function() { break; var td = document.createElement("td", {style: "padding-left: 5px; padding-right: 5px"}); - dojo.forEach(item.Children, function(tag, i){ + dojo.forEach(item.Branches, function(branch, i){ + dojo.place(document.createTextNode(branch.FullName), dojo.create("p", {style: "margin: 5px"}, td, "last"), "only"); + }); + return td; + break; + case 5: + if (this.options['minimal']) + break; + + var td = document.createElement("td", {style: "padding-left: 5px; padding-right: 5px"}); + dojo.forEach(item.Tags, function(tag, i){ dojo.place(document.createTextNode(tag.Name), dojo.create("p", {style: "margin: 5px"}, td, "last"), "only"); }); return td; diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js b/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js index 51c6321..9ec2936 100644 --- a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js +++ b/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js @@ -963,7 +963,7 @@ var exports = {}; function(jsonData, secondArg) { var trId = jsonData.Location.replace(/[^\.\:\-\_0-9A-Za-z]/g, ""); var tr = dojo.byId(trId); - dojo.place(document.createTextNode(tagName), dojo.create("p", {style: "margin: 5px"}, tr.children[5] /* tags column */, "last"), "only"); + dojo.place(document.createTextNode(tagName), dojo.create("p", {style: "margin: 5px"}, tr.children[6] /* tags column */, "last"), "only"); }); }); return clientDeferred; |