Do not show patchset details on closed tickets

James Moger

2014-04-15 a0d5c865f8e7161f73d5e4420e662e81f1640acd

Do not show patchset details on closed tickets

 src/main/java/com/gitblit/wicket/pages/TicketPage.html

@@ -316,9 +316,10 @@


<!-- PATCHSET FRAGMENT -->

<wicket:fragment wicket:id="patchsetFragment">

    <div class="row" style="padding: 0px 0px 20px;">

    <div class="row" style="padding: 0px;">

         <div class="span12 attribution-border">

            <div wicket:id="panel"></div>		
             <div wicket:id="mergePanel" style="margin-bottom: 10px;"></div>

            <div wicket:id="panel"></div>

        </div>

    </div>

    

@@ -351,9 +352,8 @@


<!-- COLLAPSIBLE PATCHSET (temp) -->

<wicket:fragment wicket:id="collapsiblePatchsetFragment">

<div wicket:id="mergePanel" style="margin-bottom: 10px;"></div>

<div class="accordion" id="accordionPatchset" style="clear:both;margin: 0px;">

<div class="patch-group">

<div class="patch-group" style="margin-bottom: 20px;">

       <div class="accordion-heading">

        <div class="attribution-patch-pullright">    

            <div style="padding-bottom: 2px;"> 


 src/main/java/com/gitblit/wicket/pages/TicketPage.java

@@ -774,12 +774,19 @@
            Fragment patchsetFrag = new Fragment("patchset", "patchsetFragment", this);

            patchsetFrag.add(new Label("commitsInPatchset", MessageFormat.format(getString("gb.commitsInPatchsetN"), currentPatchset.number)));



            // current revision

            MarkupContainer panel = createPatchsetPanel("panel", repository, user);

            patchsetFrag.add(panel);

            addUserAttributions(patchsetFrag, currentRevision, avatarWidth);

            addUserAttributions(panel, currentRevision, 0);

            addDateAttributions(panel, currentRevision);

            patchsetFrag.add(createMergePanel(user, repository));



            if (ticket.isOpen()) {

                // current revision

                MarkupContainer panel = createPatchsetPanel("panel", repository, user);

                patchsetFrag.add(panel);

                addUserAttributions(patchsetFrag, currentRevision, avatarWidth);

                addUserAttributions(panel, currentRevision, 0);

                addDateAttributions(panel, currentRevision);

            } else {

                // current revision

                patchsetFrag.add(new Label("panel").setVisible(false));

            }



            // commits

            List<RevCommit> commits = JGitUtils.getRevLog(getRepository(), currentPatchset.base, currentPatchset.tip);

@@ -1213,7 +1220,6 @@


        addPtCheckoutInstructions(user, repository, panel);

        addGitCheckoutInstructions(user, repository, panel);

        panel.add(createMergePanel(user, repository));



        return panel;

    }