Improve milestone listing and include closed milestones

James Moger

2014-04-15 a961100556e5a8aa301261f08319c54bc49ace59

Improve milestone listing and include closed milestones

 src/main/java/com/gitblit/wicket/WicketUtils.java

@@ -587,10 +587,13 @@
        if (TimeUtils.isToday(date, timeZone)) {

            title = timeUtils.today();

        } else if (TimeUtils.isYesterday(date, timeZone)) {

                title = timeUtils.yesterday();

            title = timeUtils.yesterday();

        } else if (date.getTime() <= System.currentTimeMillis()) {

            // past

            title = timeUtils.timeAgo(date);

        } else {

            // future

            title = timeUtils.inFuture(date);

        }

        if ((System.currentTimeMillis() - date.getTime()) < 10 * 24 * 60 * 60 * 1000L) {

            String tmp = dateString;


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

@@ -139,9 +139,9 @@
    </div>

    <div class="tab-pane" id="milestones">

        <div class="row">

            <div class="span9" wicket:id="milestoneList">

            <div class="span9" wicket:id="milestoneList" style="padding-bottom: 10px;">

                <h3><span wicket:id="milestoneName"></span> <small><span wicket:id="milestoneState"></span></small></h3>

                <span wicket:id="milestoneDue"></span>

                <i style="color:#888;"class="fa fa-calendar"></i> <span wicket:id="milestoneDue"></span>

            </div>

        </div>

    </div>


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

@@ -164,6 +164,9 @@
            if (currentMilestone == null) {

                // milestone not found, create a temporary one

                currentMilestone = new TicketMilestone(milestoneParam);

                String q = QueryBuilder.q(Lucene.rid.matches(getRepositoryModel().getRID())).and(Lucene.milestone.matches(milestoneParam)).build();

                currentMilestone.tickets = app().tickets().queryFor(q, 1, 0, Lucene.number.name(), true);

                milestones.add(currentMilestone);

            }

        }



@@ -643,15 +646,35 @@
        };

        add(ticketsView);



        DataView<TicketMilestone> milestonesList = new DataView<TicketMilestone>("milestoneList", milestonesDp) {

        List<TicketMilestone> allMilestones = app().tickets().getMilestones(getRepositoryModel());

        ListDataProvider<TicketMilestone> allMilestonesDp = new ListDataProvider<TicketMilestone>(allMilestones);

        DataView<TicketMilestone> milestonesList = new DataView<TicketMilestone>("milestoneList", allMilestonesDp) {

            private static final long serialVersionUID = 1L;



            @Override

            public void populateItem(final Item<TicketMilestone> item) {

                final TicketMilestone tm = item.getModelObject();

                item.add(new Label("milestoneName", tm.name));

                item.add(new Label("milestoneState", tm.status.name()));

                item.add(new Label("milestoneDue", tm.due == null ? getString("gb.notSpecified") : tm.due.toString()));

                PageParameters params = queryParameters(null, tm.name, null, null, null, desc, 1);

                item.add(new LinkPanel("milestoneName", null, tm.name, TicketsPage.class, params).setRenderBodyOnly(true));



                String css;

                switch (tm.status) {

                case Open:

                    css = "aui-lozenge aui-lozenge-subtle";

                    break;

                default:

                    css = "aui-lozenge";

                    break;

                }

                Label stateLabel = new Label("milestoneState", tm.status.name());

                WicketUtils.setCssClass(stateLabel, css);

                item.add(stateLabel);



                if (tm.due == null) {

                    item.add(new Label("milestoneDue", getString("gb.notSpecified")));

                } else {

                    item.add(WicketUtils.createDatestampLabel("milestoneDue", tm.due, getTimeZone(), getTimeUtils()));

                }

            }

        };

        add(milestonesList);