Refresh log on display. Adjusted spacing of status panel.

James Moger

2011-11-10 a568f2ac97f4c7b73ee0cdf2007f553bb8c81c2c

 src/com/gitblit/SyndicationServlet.java

@@ -28,9 +28,9 @@
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import com.gitblit.models.FeedEntryModel;

import com.gitblit.models.RefModel;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.SyndicatedEntryModel;

import com.gitblit.utils.HttpUtils;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

@@ -129,6 +129,7 @@
      String repositoryName = url;

      String objectId = request.getParameter("h");

      String l = request.getParameter("l");

      String page = request.getParameter("pg");

      String searchString = request.getParameter("s");

      Constants.SearchType searchType = Constants.SearchType.COMMIT;

      if (!StringUtils.isEmpty(request.getParameter("st"))) {

@@ -147,6 +148,13 @@
         } catch (NumberFormatException x) {

         }

      }

      int offset = 0;

      if (!StringUtils.isEmpty(page)) {

         try {

            offset = length * Integer.parseInt(page);

         } catch (NumberFormatException x) {

         }

      }



      response.setContentType("application/rss+xml; charset=UTF-8");

      Repository repository = GitBlit.self().getRepository(repositoryName);

@@ -154,14 +162,14 @@
      List<RevCommit> commits;

      if (StringUtils.isEmpty(searchString)) {

         // standard log/history lookup

         commits = JGitUtils.getRevLog(repository, objectId, 0, length);

         commits = JGitUtils.getRevLog(repository, objectId, offset, length);

      } else {

         // repository search

         commits = JGitUtils.searchRevlogs(repository, objectId, searchString, searchType, 0,

               length);

         commits = JGitUtils.searchRevlogs(repository, objectId, searchString, searchType,

               offset, length);

      }

      Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(repository);

      List<SyndicatedEntryModel> entries = new ArrayList<SyndicatedEntryModel>();

      List<FeedEntryModel> entries = new ArrayList<FeedEntryModel>();



      boolean mountParameters = GitBlit.getBoolean(Keys.web.mountParameters, true);

      String urlPattern;

@@ -175,14 +183,15 @@
      String gitblitUrl = HttpUtils.getGitblitURL(request);

      // convert RevCommit to SyndicatedEntryModel

      for (RevCommit commit : commits) {

         SyndicatedEntryModel entry = new SyndicatedEntryModel();

         FeedEntryModel entry = new FeedEntryModel();

         entry.title = commit.getShortMessage();

         entry.author = commit.getAuthorIdent().getName();

         entry.link = MessageFormat.format(urlPattern, gitblitUrl,

               StringUtils.encodeURL(model.name), commit.getName());

         entry.published = commit.getCommitterIdent().getWhen();

         entry.contentType = "text/plain";

         entry.content = commit.getFullMessage();

         entry.contentType = "text/html";

         String message = GitBlit.self().processCommitMessage(model.name, commit.getFullMessage());

         entry.content = message;

         entry.repository = model.name;

         entry.branch = objectId;

         List<RefModel> refs = allRefs.get(commit.getId());