From 6c5511020457c39961d069071ac60f7140ec724f Mon Sep 17 00:00:00 2001 From: Lukasz Jader <ljaderdev@gmail.com> Date: Wed, 19 Sep 2012 16:24:10 -0400 Subject: [PATCH] Update polish translation of EmptyRepositoryPage --- src/com/gitblit/wicket/panels/RepositoriesPanel.java | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/com/gitblit/wicket/panels/RepositoriesPanel.java index 9664e05..a113e00 100644 --- a/src/com/gitblit/wicket/panels/RepositoriesPanel.java +++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.java @@ -46,6 +46,7 @@ import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.SyndicationServlet; +import com.gitblit.models.ProjectModel; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; import com.gitblit.utils.StringUtils; @@ -54,6 +55,8 @@ import com.gitblit.wicket.pages.BasePage; import com.gitblit.wicket.pages.EditRepositoryPage; import com.gitblit.wicket.pages.EmptyRepositoryPage; +import com.gitblit.wicket.pages.ProjectPage; +import com.gitblit.wicket.pages.RepositoriesPage; import com.gitblit.wicket.pages.SummaryPage; public class RepositoriesPanel extends BasePanel { @@ -73,6 +76,16 @@ final IDataProvider<RepositoryModel> dp; Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this); + adminLinks.add(new Link<Void>("clearCache") { + + private static final long serialVersionUID = 1L; + + @Override + public void onClick() { + GitBlit.self().resetRepositoryListCache(); + setResponsePage(RepositoriesPage.class); + } + }.setVisible(GitBlit.getBoolean(Keys.git.cacheRepositoryList, true))); adminLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class)); add(adminLinks.setVisible(showAdmin)); @@ -101,10 +114,20 @@ roots.add(0, rootPath); groups.put(rootPath, rootRepositories); } + + Map<String, ProjectModel> projects = new HashMap<String, ProjectModel>(); + for (ProjectModel project : GitBlit.self().getProjectModels(user)) { + projects.put(project.name, project); + } List<RepositoryModel> groupedModels = new ArrayList<RepositoryModel>(); for (String root : roots) { List<RepositoryModel> subModels = groups.get(root); - groupedModels.add(new GroupRepositoryModel(root, subModels.size())); + GroupRepositoryModel group = new GroupRepositoryModel(root, subModels.size()); + if (projects.containsKey(root)) { + group.title = projects.get(root).title; + group.description = projects.get(root).description; + } + groupedModels.add(group); Collections.sort(subModels); groupedModels.addAll(subModels); } @@ -133,7 +156,8 @@ currGroupName = entry.name; Fragment row = new Fragment("rowContent", "groupRepositoryRow", this); item.add(row); - row.add(new Label("groupName", entry.toString())); + row.add(new LinkPanel("groupName", null, entry.toString(), ProjectPage.class, WicketUtils.newProjectParameter(entry.name))); + row.add(new Label("groupDescription", entry.description == null ? "":entry.description)); WicketUtils.setCssClass(item, "group"); // reset counter so that first row is light background counter = 0; @@ -315,6 +339,7 @@ private static final long serialVersionUID = 1L; int count; + String title; GroupRepositoryModel(String name, int count) { super(name, "", "", new Date(0)); @@ -323,7 +348,7 @@ @Override public String toString() { - return name + " (" + count + ")"; + return StringUtils.isEmpty(title) ? name : title + " (" + count + ")"; } } -- Gitblit v1.9.1