From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001 From: Gerard Smyth <gerard.smyth@gmail.com> Date: Thu, 08 May 2014 13:09:30 -0400 Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored. --- src/main/java/com/gitblit/wicket/pages/ProjectPage.java | 76 ++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/ProjectPage.java b/src/main/java/com/gitblit/wicket/pages/ProjectPage.java index c938891..d358b77 100644 --- a/src/main/java/com/gitblit/wicket/pages/ProjectPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ProjectPage.java @@ -25,12 +25,16 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.ExternalLink; -import com.gitblit.GitBlit; import com.gitblit.Keys; -import com.gitblit.SyndicationServlet; +import com.gitblit.models.Menu.MenuDivider; +import com.gitblit.models.Menu.MenuItem; +import com.gitblit.models.Menu.ParameterMenuItem; +import com.gitblit.models.NavLink.DropDownPageMenuNavLink; +import com.gitblit.models.NavLink; import com.gitblit.models.ProjectModel; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; +import com.gitblit.servlet.SyndicationServlet; import com.gitblit.utils.MarkdownUtils; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.CacheControl; @@ -38,15 +42,12 @@ import com.gitblit.wicket.GitBlitWebApp; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.GitblitRedirectException; -import com.gitblit.wicket.PageRegistration; -import com.gitblit.wicket.PageRegistration.DropDownMenuItem; -import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.FilterableRepositoryList; @CacheControl(LastModified.PROJECT) public class ProjectPage extends DashboardPage { - + List<ProjectModel> projectModels = new ArrayList<ProjectModel>(); public ProjectPage() { @@ -58,7 +59,8 @@ super(params); setup(params); } - + + @Override protected Class<? extends BasePage> getRootNavPageClass() { return RepositoriesPage.class; } @@ -82,35 +84,35 @@ } } } - + private void setup(PageParameters params) { setupPage("", ""); // check to see if we should display a login message - boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, true); + boolean authenticateView = app().settings().getBoolean(Keys.web.authenticateViewPages, true); if (authenticateView && !GitBlitWebSession.get().isLoggedIn()) { authenticationError("Please login"); return; } - String projectName = WicketUtils.getProjectName(params); + String projectName = params == null ? null : WicketUtils.getProjectName(params); if (StringUtils.isEmpty(projectName)) { throw new GitblitRedirectException(GitBlitWebApp.get().getHomePage()); } - + ProjectModel project = getProjectModel(projectName); if (project == null) { throw new GitblitRedirectException(GitBlitWebApp.get().getHomePage()); } - + add(new Label("projectTitle", project.getDisplayName())); add(new Label("projectDescription", project.description)); - + String feedLink = SyndicationServlet.asLink(getRequest().getRelativePathPrefixToContextRoot(), projectName, null, 0); add(new ExternalLink("syndication", feedLink)); add(WicketUtils.syndicationDiscoveryLink(SyndicationServlet.getTitle(project.getDisplayName(), null), feedLink)); - + // project markdown message String pmessage = transformMarkdown(project.projectMarkdown); Component projectMessage = new Label("projectMessage", pmessage) @@ -129,13 +131,15 @@ } int daysBack = params == null ? 0 : WicketUtils.getDaysBack(params); if (daysBack < 1) { - daysBack = GitBlit.getInteger(Keys.web.activityDuration, 7); + daysBack = app().settings().getInteger(Keys.web.activityDuration, 7); } // reset the daysback parameter so that we have a complete project // repository list. the recent activity will be built up by the // reflog utils. - params.remove("db"); - + if (params != null) { + params.remove("db"); + } + List<RepositoryModel> repositories = getRepositories(params); Collections.sort(repositories, new Comparator<RepositoryModel>() { @Override @@ -146,7 +150,7 @@ }); addActivity(user, repositories, getString("gb.recentActivity"), daysBack); - + if (repositories.isEmpty()) { add(new Label("repositoryList").setVisible(false)); } else { @@ -155,12 +159,12 @@ add(repoList); } } - + @Override - protected void addDropDownMenus(List<PageRegistration> pages) { + protected void addDropDownMenus(List<NavLink> navLinks) { PageParameters params = getPageParameters(); - DropDownMenuRegistration menu = new DropDownMenuRegistration("gb.filters", + DropDownPageMenuNavLink menu = new DropDownPageMenuNavLink("gb.filters", ProjectPage.class); // preserve time filter option on repository choices menu.menuItems.addAll(getRepositoryFilterItems(params)); @@ -170,27 +174,27 @@ if (menu.menuItems.size() > 0) { // Reset Filter - menu.menuItems.add(new DropDownMenuItem(getString("gb.reset"), "p", WicketUtils.getProjectName(params))); + menu.menuItems.add(new ParameterMenuItem(getString("gb.reset"), "p", WicketUtils.getProjectName(params))); } - pages.add(menu); - - DropDownMenuRegistration projects = new DropDownMenuRegistration("gb.projects", + navLinks.add(menu); + + DropDownPageMenuNavLink projects = new DropDownPageMenuNavLink("gb.projects", ProjectPage.class); projects.menuItems.addAll(getProjectsMenu()); - pages.add(projects); + navLinks.add(projects); } - + @Override protected List<ProjectModel> getProjectModels() { if (projectModels.isEmpty()) { List<RepositoryModel> repositories = getRepositoryModels(); - List<ProjectModel> projects = GitBlit.self().getProjectModels(repositories, false); + List<ProjectModel> projects = app().projects().getProjectModels(repositories, false); projectModels.addAll(projects); } return projectModels; } - + private ProjectModel getProjectModel(String name) { for (ProjectModel project : getProjectModels()) { if (name.equalsIgnoreCase(project.name)) { @@ -199,9 +203,9 @@ } return null; } - - protected List<DropDownMenuItem> getProjectsMenu() { - List<DropDownMenuItem> menu = new ArrayList<DropDownMenuItem>(); + + protected List<MenuItem> getProjectsMenu() { + List<MenuItem> menu = new ArrayList<MenuItem>(); List<ProjectModel> projects = new ArrayList<ProjectModel>(); for (ProjectModel model : getProjectModels()) { if (!model.isUserProject()) { @@ -228,15 +232,15 @@ } for (ProjectModel project : projects) { - menu.add(new DropDownMenuItem(project.getDisplayName(), "p", project.name)); + menu.add(new ParameterMenuItem(project.getDisplayName(), "p", project.name)); } if (showAllProjects) { - menu.add(new DropDownMenuItem()); - menu.add(new DropDownMenuItem("all projects", null, null)); + menu.add(new MenuDivider()); + menu.add(new ParameterMenuItem("all projects")); } return menu; } - + private String transformMarkdown(String markdown) { String message = ""; if (!StringUtils.isEmpty(markdown)) { -- Gitblit v1.9.1