Return to Users page after add/edit team

James Moger

2012-02-03 fe7c01a8bd76dff240e74bb770212911e227ba59

 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;

@@ -169,7 +169,7 @@
               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;

@@ -183,24 +183,33 @@
      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;

         entry.branch = objectId;			
         entry.tags = new ArrayList<String>();

			
         // add commit id and parent commit ids

         entry.tags.add("commit:" + commit.getName());

         for (RevCommit parent : commit.getParents()) {

            entry.tags.add("parent:" + parent.getName());

         }

			
         // add refs to tabs list

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

         if (refs != null && refs.size() > 0) {

            List<String> tags = new ArrayList<String>();

            for (RefModel ref : refs) {

               tags.add(ref.getName());

               entry.tags.add("ref:" + ref.getName());

            }

            entry.tags = tags;

         }

         }			
         entries.add(entry);

      }

      String feedLink;