Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 14:05:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/takezoe/gitbucket

Browse Source
This commit is contained in:
takezoe
2013-09-18 20:13:17 +09:00
parent 3c865ea20b d5b47e5adb
commit 32672262ef
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/servlet/TransactionFilter.scala
View File

@@ -21,9 +21,9 @@ class TransactionFilter extends Filter {
chain.doFilter(req, res)
} else {
Database(req.getServletContext) withTransaction {
logger.debug("TODO begin transaction")
logger.debug("begin transaction")
chain.doFilter(req, res)
logger.debug("TODO end transaction")
logger.debug("end transaction")
}
}
}

2
src/main/twirl/header.scala.html
View File

@@ -50,8 +50,6 @@
}
</tr>
</table>
<form method="POST" id="repository_form">
</form>
<script type="text/javascript">
$(function(){
$('table.global-nav th.box-header').click(function(){

2
src/main/twirl/issues/issue.scala.html
View File

@@ -41,7 +41,7 @@
@labels.map { label =>
<li>
<a href="#" class="toggle-label" data-label-id="@label.labelId">
<i class="@{if(issueLabels.exists(_.labelId == label.labelId)) "icon-ok" else "icon-white"}"></i>
@helper.html.checkicon(issueLabels.exists(_.labelId == label.labelId))
<span class="label" style="background-color: #@label.color;">&nbsp;</span>
@label.labelName
</a>

11
src/main/twirl/issues/issuedetail.scala.html
View File

@@ -28,7 +28,7 @@
@helper.html.dropdown() {
<li><a href="javascript:void(0);" class="assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
@collaborators.map { collaborator =>
<li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-white"></i>@avatar(collaborator, 20) @collaborator</a></li>
<li><a href="javascript:void(0);" class="assign" data-name="@collaborator">@helper.html.checkicon(collaborator == issue.assignedUserName)@avatar(collaborator, 20) @collaborator</a></li>
}
}
}
@@ -53,7 +53,7 @@
@milestones.map { case (milestone, _, _) =>
<li>
<a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
<i class="icon-white"></i> @milestone.title
@helper.html.checkicon(milestone.milestoneId == issue.milestoneId) @milestone.title
<div class="small" style="padding-left: 20px;">
@milestone.dueDate.map { dueDate =>
@if(isPast(dueDate)){
@@ -85,13 +85,6 @@
</div>
<script>
$(function(){
@if(issue.assignedUserName.isDefined){
$('a.assign[data-name=@issue.assignedUserName] i').attr('class', 'icon-ok');
}
@if(issue.milestoneId.isDefined){
$('a.milestone[data-id=@issue.milestoneId] i').attr('class', 'icon-ok');
}
$('#edit').click(function(){
$.get('@url(repository)/issues/_data/@issue.issueId',
{