Disable edit links in read only mode #974

Paul Martin

2016-03-14 713d27789bc0b5d82b607fed20e5f16ad9216898

Disable edit links in read only mode #974

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

@@ -25,11 +25,13 @@
import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.models.UserModel;

import com.gitblit.servlet.RawServlet;

import com.gitblit.utils.BugtraqProcessor;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.CacheControl;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.CacheControl.LastModified;

import com.gitblit.wicket.MarkupProcessor;

import com.gitblit.wicket.MarkupProcessor.MarkupDocument;

@@ -44,7 +46,9 @@


        final String path = WicketUtils.getPath(params).replace("%2f", "/").replace("%2F", "/");

        MarkupProcessor processor = new MarkupProcessor(app().settings(), app().xssFilter());



        UserModel currentUser = (GitBlitWebSession.get().getUser() != null) ? GitBlitWebSession.get().getUser() : UserModel.ANONYMOUS;

        final boolean userCanEdit = currentUser.canEdit(getRepositoryModel());

		
        Repository r = getRepository();

        RevCommit commit = JGitUtils.getCommit(r, objectId);

        String [] encodings = getEncodings();

@@ -86,7 +90,8 @@


        // document page links

        fragment.add(new BookmarkablePageLink<Void>("editLink", EditFilePage.class,

                WicketUtils.newPathParameter(repositoryName, objectId, documentPath)));

                WicketUtils.newPathParameter(repositoryName, objectId, documentPath))

                .setEnabled(userCanEdit));

        fragment.add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,

                WicketUtils.newPathParameter(repositoryName, objectId, documentPath)));

        fragment.add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,


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

@@ -27,15 +27,19 @@
import org.apache.wicket.markup.repeater.Item;

import org.apache.wicket.markup.repeater.data.DataView;

import org.apache.wicket.markup.repeater.data.ListDataProvider;

import org.apache.wicket.model.StringResourceModel;

import org.eclipse.jgit.diff.DiffEntry.ChangeType;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.models.PathModel;

import com.gitblit.models.UserModel;

import com.gitblit.servlet.RawServlet;

import com.gitblit.utils.ByteFormat;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.CacheControl;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.CacheControl.LastModified;

import com.gitblit.wicket.MarkupProcessor;

import com.gitblit.wicket.MarkupProcessor.MarkupDocument;

@@ -54,6 +58,9 @@
        MarkupProcessor processor = new MarkupProcessor(app().settings(), app().xssFilter());



        Repository r = getRepository();

        UserModel currentUser = (GitBlitWebSession.get().getUser() != null) ? GitBlitWebSession.get().getUser() : UserModel.ANONYMOUS;

        final boolean userCanEdit = currentUser.canEdit(getRepositoryModel());

		
        RevCommit head = JGitUtils.getCommit(r, objectId);

        final String commitId = getBestCommitId(head);



@@ -102,9 +109,12 @@
                @Override

                public void populateItem(final Item<MarkupDocument> item) {

                    MarkupDocument doc = item.getModelObject();

                    // document page links

					
                    item.add(new BookmarkablePageLink<Void>("editLink", EditFilePage.class,

                            WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath)));

                            WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath))

                            .setEnabled(userCanEdit));

					
                    // document page links					
                    item.add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,

                            WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath)));

                    item.add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,

@@ -151,7 +161,8 @@
                item.add(new BookmarkablePageLink<Void>("view", DocPage.class, WicketUtils

                        .newPathParameter(repositoryName, commitId, entry.path)));

                item.add(new BookmarkablePageLink<Void>("edit", EditFilePage.class, WicketUtils

                        .newPathParameter(repositoryName, commitId, entry.path)));

                        .newPathParameter(repositoryName, commitId, entry.path))

                        .setEnabled(userCanEdit));

                String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, commitId, entry.path);

                item.add(new ExternalLink("raw", rawUrl));

                item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils