Fixes sort, page building and search functions on "my tickets" page.

Hybris95

2014-04-22 3f5b8f5d9203aa7ffb7fbe9cdbaf9dba3da6cae6

 src/main/java/com/gitblit/wicket/GitblitWicketFilter.java

@@ -19,14 +19,16 @@


import javax.servlet.http.HttpServletRequest;



import org.apache.wicket.protocol.http.IWebApplicationFactory;

import org.apache.wicket.protocol.http.WebApplication;

import org.apache.wicket.protocol.http.WicketFilter;

import org.apache.wicket.util.string.Strings;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.GitBlit;

import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.dagger.DaggerWicketFilter;

import com.gitblit.manager.IProjectManager;

import com.gitblit.manager.IRepositoryManager;

import com.gitblit.manager.IRuntimeManager;

@@ -34,6 +36,8 @@
import com.gitblit.models.RepositoryModel;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;



import dagger.ObjectGraph;



/**

 *

@@ -43,7 +47,36 @@
 * @author James Moger

 *

 */

public class GitblitWicketFilter extends WicketFilter {

public class GitblitWicketFilter extends DaggerWicketFilter {



   private IStoredSettings settings;



   private IRuntimeManager runtimeManager;



   private IRepositoryManager repositoryManager;



   private IProjectManager projectManager;



   private GitBlitWebApp webapp;



   @Override

   protected void inject(ObjectGraph dagger) {

      this.settings = dagger.get(IStoredSettings.class);

      this.runtimeManager = dagger.get(IRuntimeManager.class);

      this.repositoryManager = dagger.get(IRepositoryManager.class);

      this.projectManager = dagger.get(IProjectManager.class);

      this.webapp = dagger.get(GitBlitWebApp.class);

   }



   @Override

   protected IWebApplicationFactory getApplicationFactory() {

      return new IWebApplicationFactory() {

         @Override

         public WebApplication createApplication(WicketFilter filter) {

            return webapp;

         }

      };

   }



   /**

    * Determines the last-modified date of the requested resource.

@@ -54,8 +87,9 @@
   @Override

   protected long getLastModified(final HttpServletRequest servletRequest)   {

      final String pathInfo = getRelativePath(servletRequest);

      if (Strings.isEmpty(pathInfo))

      if (Strings.isEmpty(pathInfo)) {

         return -1;

      }

      long lastModified = super.getLastModified(servletRequest);

      if (lastModified > -1) {

         return lastModified;

@@ -80,11 +114,6 @@
      if (!StringUtils.isEmpty(servletRequest.getParameter("h"))) {

         commitId = servletRequest.getParameter("h");

      }



      IRuntimeManager runtimeManager = GitBlit.getManager(IRuntimeManager.class);

      IStoredSettings settings = runtimeManager.getSettings();

      IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);

      IProjectManager projectManager = GitBlit.getManager(IProjectManager.class);



      repo = repo.replace("%2f", "/").replace("%2F", "/").replace(settings.getChar(Keys.web.forwardSlashCharacter, '/'), '/');