From 27ae9095639bb228a1b7ff86a3ebe4264abf05be Mon Sep 17 00:00:00 2001
From: mschaefers <mschaefers@scoop-gmbh.de>
Date: Thu, 29 Nov 2012 12:33:09 -0500
Subject: [PATCH] feature: when using LdapUserService one can configure Gitblit to fetch all users from ldap that can possibly login. This allows to see newly generated LDAP users instantly in Gitblit. By now an LDAP user had to log in once to appear in GitBlit.
---
src/com/gitblit/models/SearchResult.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/models/SearchResult.java b/src/com/gitblit/models/SearchResult.java
index 4a03a70..efd1b07 100644
--- a/src/com/gitblit/models/SearchResult.java
+++ b/src/com/gitblit/models/SearchResult.java
@@ -4,7 +4,7 @@
import java.util.Date;
import java.util.List;
-import com.gitblit.utils.LuceneUtils.ObjectType;
+import com.gitblit.Constants.SearchObjectType;
/**
* Model class that represents a search result.
@@ -15,6 +15,10 @@
public class SearchResult implements Serializable {
private static final long serialVersionUID = 1L;
+
+ public int hitId;
+
+ public int totalHits;
public float score;
@@ -26,19 +30,41 @@
public String summary;
+ public String fragment;
+
public String repository;
+
+ public String branch;
- public String id;
+ public String commitId;
+
+ public String path;
+
+ public String issueId;
+ public List<String> tags;
+
public List<String> labels;
- public ObjectType type;
+ public SearchObjectType type;
public SearchResult() {
+ }
+
+ public String getId() {
+ switch (type) {
+ case blob:
+ return path;
+ case commit:
+ return commitId;
+ case issue:
+ return issueId;
+ }
+ return commitId;
}
@Override
public String toString() {
- return score + " : " + type.name() + " : " + repository + " : " + id;
+ return score + " : " + type.name() + " : " + repository + " : " + getId() + " (" + branch + ")";
}
}
\ No newline at end of file
--
Gitblit v1.9.1