From 11c14e192b907acd3fdc2d6a9bcf4faafc593afe Mon Sep 17 00:00:00 2001 From: Rafael Cavazin <rafaelcavazin@gmail.com> Date: Sun, 27 Jan 2013 11:13:06 -0500 Subject: [PATCH] updating latest props, and some pt-br fixing --- src/com/gitblit/wicket/pages/RepositoryPage.java | 188 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 165 insertions(+), 23 deletions(-) diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java index 19a5de2..a477b74 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/com/gitblit/wicket/pages/RepositoryPage.java @@ -47,8 +47,11 @@ import com.gitblit.Keys; import com.gitblit.PagesServlet; import com.gitblit.SyndicationServlet; +import com.gitblit.models.ProjectModel; +import com.gitblit.models.RefModel; import com.gitblit.models.RepositoryModel; import com.gitblit.models.SubmoduleModel; +import com.gitblit.models.UserModel; import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.StringUtils; @@ -64,6 +67,7 @@ public abstract class RepositoryPage extends BasePage { + protected final String projectName; protected final String repositoryName; protected final String objectId; @@ -74,10 +78,18 @@ private Map<String, SubmoduleModel> submodules; private final Map<String, PageRegistration> registeredPages; - + private boolean showAdmin; + private boolean isOwner; + public RepositoryPage(PageParameters params) { super(params); repositoryName = WicketUtils.getRepositoryName(params); + String root =StringUtils.getFirstPathElement(repositoryName); + if (StringUtils.isEmpty(root)) { + projectName = GitBlit.getString(Keys.web.repositoryRootGroupName, "main"); + } else { + projectName = root; + } objectId = WicketUtils.getObject(params); if (StringUtils.isEmpty(repositoryName)) { @@ -86,6 +98,26 @@ if (!getRepositoryModel().hasCommits) { setResponsePage(EmptyRepositoryPage.class, params); + } + + if (getRepositoryModel().isCollectingGarbage) { + error(MessageFormat.format(getString("gb.busyCollectingGarbage"), getRepositoryModel().name), true); + } + + if (objectId != null) { + RefModel branch = null; + if ((branch = JGitUtils.getBranch(getRepository(), objectId)) != null) { + UserModel user = GitBlitWebSession.get().getUser(); + if (user == null) { + // workaround until get().getUser() is reviewed throughout the app + user = UserModel.ANONYMOUS; + } + boolean canAccess = user.canView(getRepositoryModel(), + branch.reference.getName()); + if (!canAccess) { + error(getString("gb.accessDenied"), true); + } + } } // register the available page links for this page and user @@ -122,6 +154,9 @@ pages.put("branches", new PageRegistration("gb.branches", BranchesPage.class, params)); pages.put("tags", new PageRegistration("gb.tags", TagsPage.class, params)); pages.put("tree", new PageRegistration("gb.tree", TreePage.class, params)); + if (GitBlit.getBoolean(Keys.web.allowForking, true)) { + pages.put("forks", new PageRegistration("gb.forks", ForksPage.class, params)); + } // conditional links Repository r = getRepository(); @@ -141,37 +176,138 @@ } // Conditionally add edit link - final boolean showAdmin; + showAdmin = false; if (GitBlit.getBoolean(Keys.web.authenticateAdminPages, true)) { boolean allowAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, false); showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin(); } else { showAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, false); } - if (showAdmin - || GitBlitWebSession.get().isLoggedIn() - && (model.owner != null && model.owner.equalsIgnoreCase(GitBlitWebSession.get() - .getUsername()))) { + isOwner = GitBlitWebSession.get().isLoggedIn() + && (model.isOwner(GitBlitWebSession.get() + .getUsername())); + if (showAdmin || isOwner) { pages.put("edit", new PageRegistration("gb.edit", EditRepositoryPage.class, params)); } return pages; } + + protected boolean allowForkControls() { + return GitBlit.getBoolean(Keys.web.allowForking, true); + } @Override protected void setupPage(String repositoryName, String pageName) { - add(new LinkPanel("repositoryName", null, StringUtils.stripDotGit(repositoryName), - SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryName))); - add(new Label("pageName", pageName).setRenderBodyOnly(true)); - if (getRepositoryModel().isBare) { - add(new Label("workingCopy").setVisible(false)); + String projectName = StringUtils.getFirstPathElement(repositoryName); + ProjectModel project = GitBlit.self().getProjectModel(projectName); + if (project.isUserProject()) { + // user-as-project + add(new LinkPanel("projectTitle", null, project.getDisplayName(), + UserPage.class, WicketUtils.newUsernameParameter(project.name.substring(1)))); } else { - Fragment fragment = new Fragment("workingCopy", "workingCopyFragment", this); - Label lbl = new Label("workingCopy", getString("gb.workingCopy")); - WicketUtils.setHtmlTooltip(lbl, getString("gb.workingCopyWarning")); - fragment.add(lbl); - add(fragment); + // project + add(new LinkPanel("projectTitle", null, project.name, + ProjectPage.class, WicketUtils.newProjectParameter(project.name))); + } + + String name = StringUtils.stripDotGit(repositoryName); + if (!StringUtils.isEmpty(projectName) && name.startsWith(projectName)) { + name = name.substring(projectName.length() + 1); + } + add(new LinkPanel("repositoryName", null, name, SummaryPage.class, + WicketUtils.newRepositoryParameter(repositoryName))); + add(new Label("pageName", pageName).setRenderBodyOnly(true)); + + UserModel user = GitBlitWebSession.get().getUser(); + if (user == null) { + user = UserModel.ANONYMOUS; } + // indicate origin repository + RepositoryModel model = getRepositoryModel(); + if (StringUtils.isEmpty(model.originRepository)) { + add(new Label("originRepository").setVisible(false)); + } else { + RepositoryModel origin = GitBlit.self().getRepositoryModel(model.originRepository); + if (origin == null) { + // no origin repository + add(new Label("originRepository").setVisible(false)); + } else if (!user.canView(origin)) { + // show origin repository without link + Fragment forkFrag = new Fragment("originRepository", "originFragment", this); + forkFrag.add(new Label("originRepository", StringUtils.stripDotGit(model.originRepository))); + add(forkFrag); + } else { + // link to origin repository + Fragment forkFrag = new Fragment("originRepository", "originFragment", this); + forkFrag.add(new LinkPanel("originRepository", null, StringUtils.stripDotGit(model.originRepository), + SummaryPage.class, WicketUtils.newRepositoryParameter(model.originRepository))); + add(forkFrag); + } + } + + // show sparkleshare folder icon + if (model.isSparkleshared()) { + add(WicketUtils.newImage("repositoryIcon", "folder_star_32x32.png", + getString("gb.isSparkleshared"))); + } else { + add(WicketUtils.newClearPixel("repositoryIcon").setVisible(false)); + } + + if (getRepositoryModel().isBare) { + add(new Label("workingCopyIndicator").setVisible(false)); + } else { + Fragment wc = new Fragment("workingCopyIndicator", "workingCopyFragment", this); + Label lbl = new Label("workingCopy", getString("gb.workingCopy")); + WicketUtils.setHtmlTooltip(lbl, getString("gb.workingCopyWarning")); + wc.add(lbl); + add(wc); + } + + // fork controls + if (!allowForkControls() || user == null || !user.isAuthenticated) { + // must be logged-in to fork, hide all fork controls + add(new ExternalLink("forkLink", "").setVisible(false)); + add(new ExternalLink("myForkLink", "").setVisible(false)); + add(new Label("forksProhibitedIndicator").setVisible(false)); + } else { + String fork = GitBlit.self().getFork(user.username, model.name); + boolean hasFork = fork != null; + boolean canFork = user.canFork(model); + + if (hasFork || !canFork) { + // user not allowed to fork or fork already exists or repo forbids forking + add(new ExternalLink("forkLink", "").setVisible(false)); + + if (user.canFork() && !model.allowForks) { + // show forks prohibited indicator + Fragment wc = new Fragment("forksProhibitedIndicator", "forksProhibitedFragment", this); + Label lbl = new Label("forksProhibited", getString("gb.forksProhibited")); + WicketUtils.setHtmlTooltip(lbl, getString("gb.forksProhibitedWarning")); + wc.add(lbl); + add(wc); + } else { + // can not fork, no need for forks prohibited indicator + add(new Label("forksProhibitedIndicator").setVisible(false)); + } + + if (hasFork && !fork.equals(model.name)) { + // user has fork, view my fork link + String url = getRequestCycle().urlFor(SummaryPage.class, WicketUtils.newRepositoryParameter(fork)).toString(); + add(new ExternalLink("myForkLink", url)); + } else { + // no fork, hide view my fork link + add(new ExternalLink("myForkLink", "").setVisible(false)); + } + } else if (canFork) { + // can fork and we do not have one + add(new Label("forksProhibitedIndicator").setVisible(false)); + add(new ExternalLink("myForkLink", "").setVisible(false)); + String url = getRequestCycle().urlFor(ForkPage.class, WicketUtils.newRepositoryParameter(model.name)).toString(); + add(new ExternalLink("forkLink", url)); + } + } + super.setupPage(repositoryName, pageName); } @@ -198,7 +334,7 @@ RepositoryModel model = GitBlit.self().getRepositoryModel( GitBlitWebSession.get().getUser(), repositoryName); if (model == null) { - if (GitBlit.self().hasRepository(repositoryName)) { + if (GitBlit.self().hasRepository(repositoryName, true)) { // has repository, but unauthorized authenticationError(getString("gb.unauthorizedAccessForRepository") + " " + repositoryName); } else { @@ -229,10 +365,6 @@ submodules.put(model.path, model); } } - return submodules; - } - - protected Map<String, SubmoduleModel> getSubmodules() { return submodules; } @@ -299,11 +431,11 @@ } protected String getShortObjectId(String objectId) { - return objectId.substring(0, 8); + return objectId.substring(0, GitBlit.getInteger(Keys.web.shortCommitIdLength, 6)); } protected void addRefs(Repository r, RevCommit c) { - add(new RefsPanel("refsPanel", repositoryName, c, JGitUtils.getAllRefs(r))); + add(new RefsPanel("refsPanel", repositoryName, c, JGitUtils.getAllRefs(r, getRepositoryModel().showRemoteBranches))); } protected void addFullText(String wicketId, String text, boolean substituteRegex) { @@ -322,6 +454,8 @@ Constants.SearchType searchType) { String name = identity == null ? "" : identity.getName(); String address = identity == null ? "" : identity.getEmailAddress(); + name = StringUtils.removeNewlines(name); + address = StringUtils.removeNewlines(address); boolean showEmail = GitBlit.getBoolean(Keys.web.showEmailAddresses, false); if (!showEmail || StringUtils.isEmpty(name) || StringUtils.isEmpty(address)) { String value = name; @@ -405,6 +539,14 @@ return WicketUtils.newObjectParameter(repositoryName, commitId); } + public boolean isShowAdmin() { + return showAdmin; + } + + public boolean isOwner() { + return isOwner; + } + private class SearchForm extends SessionlessForm<Void> implements Serializable { private static final long serialVersionUID = 1L; -- Gitblit v1.9.1