From 9ae72a95a2eae7f5483b30bea627af8f2f2f8330 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 14 Mar 2012 16:20:29 -0400
Subject: [PATCH] Wrapped activity page charts with table due to GoogleCharts update :(
---
src/com/gitblit/GitServlet.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/GitServlet.java b/src/com/gitblit/GitServlet.java
index 36e1c3e..473e4c9 100644
--- a/src/com/gitblit/GitServlet.java
+++ b/src/com/gitblit/GitServlet.java
@@ -99,9 +99,9 @@
}
/**
- * Transitional wrapper class to configure the JGit 1.2 GitFilter.
- * This GitServlet will probably be replaced by a GitFilter so that Gitblit
- * can serve Git repositories on the root URL and not a /git sub-url.
+ * Transitional wrapper class to configure the JGit 1.2 GitFilter. This
+ * GitServlet will probably be replaced by a GitFilter so that Gitblit can
+ * serve Git repositories on the root URL and not a /git sub-url.
*
* @author James Moger
*
@@ -160,9 +160,9 @@
*/
@Override
public void onPreReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {
- Set<String> scripts = new LinkedHashSet<String>();
- scripts.addAll(GitBlit.getStrings(Keys.groovy.preReceiveScripts));
RepositoryModel repository = getRepositoryModel(rp);
+ Set<String> scripts = new LinkedHashSet<String>();
+ scripts.addAll(GitBlit.self().getPreReceiveScriptsInherited(repository));
scripts.addAll(repository.preReceiveScripts);
UserModel user = getUserModel(rp);
runGroovy(repository, user, commands, scripts);
@@ -188,15 +188,18 @@
logger.info("skipping post-receive hooks, no refs created, updated, or removed");
return;
}
- Set<String> scripts = new LinkedHashSet<String>();
- scripts.addAll(GitBlit.getStrings(Keys.groovy.postReceiveScripts));
RepositoryModel repository = getRepositoryModel(rp);
+ Set<String> scripts = new LinkedHashSet<String>();
+ scripts.addAll(GitBlit.self().getPostReceiveScriptsInherited(repository));
scripts.addAll(repository.postReceiveScripts);
UserModel user = getUserModel(rp);
runGroovy(repository, user, commands, scripts);
// Experimental
// runNativeScript(rp, "hooks/post-receive", commands);
+
+ // Update the Lucene search index
+ GitBlit.self().updateLuceneIndex(repository);
}
/**
@@ -208,8 +211,8 @@
protected RepositoryModel getRepositoryModel(ReceivePack rp) {
Repository repository = rp.getRepository();
String rootPath = GitBlit.getRepositoriesFolder().getAbsolutePath();
- String repositoryName = repository.getDirectory().getAbsolutePath();
- repositoryName = repositoryName.substring(rootPath.length() + 1);
+ String repositoryName = StringUtils.getRelativePath(rootPath, repository.getDirectory()
+ .getAbsolutePath());
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
return model;
}
--
Gitblit v1.9.1