From ec5a889c907af30afeba527def2d9f836eecbec4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Nov 2011 08:50:47 -0400
Subject: [PATCH] Feeds and Manager must respect a server's web.mountParameters setting
---
src/com/gitblit/client/SyndicatedEntryTableModel.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/client/SyndicatedEntryTableModel.java b/src/com/gitblit/client/SyndicatedEntryTableModel.java
index 4f25c9b..93177a8 100644
--- a/src/com/gitblit/client/SyndicatedEntryTableModel.java
+++ b/src/com/gitblit/client/SyndicatedEntryTableModel.java
@@ -25,7 +25,7 @@
import com.gitblit.models.SyndicatedEntryModel;
/**
- * Table model of List<SyndicatedEntryModel>
+ * Table model for a list of retrieved feed entries.
*
* @author James Moger
*
@@ -34,10 +34,12 @@
private static final long serialVersionUID = 1L;
+ private final GitblitClient gitblit;
+
List<SyndicatedEntryModel> entries;
enum Columns {
- Date, Repository, Author, Message;
+ Date, Repository, Author, Message, Branch;
@Override
public String toString() {
@@ -45,12 +47,9 @@
}
}
- public SyndicatedEntryTableModel() {
- this(new ArrayList<SyndicatedEntryModel>());
- }
-
- public SyndicatedEntryTableModel(List<SyndicatedEntryModel> entries) {
- setEntries(entries);
+ public SyndicatedEntryTableModel(GitblitClient gitblit) {
+ this.gitblit = gitblit;
+ this.entries = new ArrayList<SyndicatedEntryModel>();
}
public void setEntries(List<SyndicatedEntryModel> entries) {
@@ -76,6 +75,8 @@
return Translation.get("gb.date");
case Repository:
return Translation.get("gb.repository");
+ case Branch:
+ return Translation.get("gb.branch");
case Author:
return Translation.get("gb.author");
case Message:
@@ -107,9 +108,15 @@
return entry.published;
case Repository:
return entry.repository;
+ case Branch:
+ return entry.branch;
case Author:
return entry.author;
case Message:
+ Date lastRefresh = gitblit.getLastFeedRefresh(entry.repository, entry.branch);
+ if (entry.published.after(lastRefresh)) {
+ return "<html><body><b>" + entry.title;
+ }
return entry.title;
}
return null;
--
Gitblit v1.9.1