Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

 src/main/java/com/gitblit/wicket/pages/RootPage.java

@@ -36,6 +36,7 @@

import org.apache.wicket.MarkupContainer;
import org.apache.wicket.PageParameters;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -184,6 +185,11 @@
      // navigation links
      List<NavLink> navLinks = new ArrayList<NavLink>();
      if (!authenticateView || (authenticateView && isLoggedIn)) {
         UserModel user = UserModel.ANONYMOUS;
         if (isLoggedIn) {
            user = GitBlitWebSession.get().getUser();
         }

         navLinks.add(new PageNavLink(isLoggedIn ? "gb.myDashboard" : "gb.dashboard", MyDashboardPage.class,
               getRootPageParameters()));
         if (isLoggedIn && app().tickets().isReady()) {
@@ -191,6 +197,9 @@
         }
         navLinks.add(new PageNavLink("gb.repositories", RepositoriesPage.class,
               getRootPageParameters()));
			
         navLinks.add(new PageNavLink("gb.filestore", FilestorePage.class, getRootPageParameters()));
				
         navLinks.add(new PageNavLink("gb.activity", ActivityPage.class, getRootPageParameters()));
         if (allowLucene) {
            navLinks.add(new PageNavLink("gb.search", LuceneSearchPage.class));
@@ -198,11 +207,6 @@

         if (!authenticateView || (authenticateView && isLoggedIn)) {
            addDropDownMenus(navLinks);
         }

         UserModel user = UserModel.ANONYMOUS;
         if (isLoggedIn) {
            user = GitBlitWebSession.get().getUser();
         }

         // add nav link extensions
@@ -565,7 +569,9 @@
               String username = RootPage.this.username.getObject();
               char[] password = RootPage.this.password.getObject().toCharArray();

               UserModel user = app().authentication().authenticate(username, password);
               HttpServletRequest request = ((WebRequest)RequestCycle.get().getRequest()).getHttpServletRequest();

               UserModel user = app().authentication().authenticate(username, password, request.getRemoteAddr());
               if (user == null) {
                  error(getString("gb.invalidUsernameOrPassword"));
               } else if (user.username.equals(Constants.FEDERATION_USER)) {