Move repository ownership to the UserModel and prepare for project ownershipticket/75

1 files changed, 8 insertions, 13 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
index 090c0952..a3544c70 100644
--- a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
@@ -18,7 +18,6 @@ package com.gitblit.wicket.pages;
 import java.text.MessageFormat;

 import java.text.ParseException;

 import java.text.SimpleDateFormat;

-import java.util.ArrayList;

 import java.util.Date;

 import java.util.List;

 

@@ -36,6 +35,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
 

 import com.gitblit.Keys;

 import com.gitblit.models.Metric;

+import com.gitblit.models.Owner;

 import com.gitblit.models.RepositoryModel;

 import com.gitblit.models.UserModel;

 import com.gitblit.utils.JGitUtils;

@@ -88,23 +88,18 @@ public class SummaryPage extends RepositoryPage {
 		add(new Label("repositoryDescription", getRepositoryModel().description));

 

 		// owner links

-		final List<String> owners = new ArrayList<String>(getRepositoryModel().owners);

-		ListDataProvider<String> ownersDp = new ListDataProvider<String>(owners);

-		DataView<String> ownersView = new DataView<String>("repositoryOwners", ownersDp) {

+		final List<Owner> owners = app().users().getOwners(getRepositoryModel());

+		ListDataProvider<Owner> ownersDp = new ListDataProvider<>(owners);

+		DataView<Owner> ownersView = new DataView<Owner>("repositoryOwners", ownersDp) {

 			private static final long serialVersionUID = 1L;

 			int counter = 0;

 			@Override

-			public void populateItem(final Item<String> item) {

-				String ownername = item.getModelObject();

-				UserModel ownerModel = app().users().getUserModel(ownername);

-				if (ownerModel != null) {

+			public void populateItem(final Item<Owner> item) {

+				Owner owner = item.getModelObject();

+				if (owner instanceof UserModel) {

+					UserModel ownerModel = (UserModel) owner;

 					item.add(new LinkPanel("owner", null, ownerModel.getDisplayName(), UserPage.class,

 							WicketUtils.newUsernameParameter(ownerModel.username)).setRenderBodyOnly(true));

-				} else {

-					Label owner = new Label("owner", ownername);

-					WicketUtils.setCssStyle(owner, "text-decoration: line-through;");

-					WicketUtils.setHtmlTooltip(owner,  MessageFormat.format(getString("gb.failedToFindAccount"), ownername));

-					item.add(owner);

 				}

 				counter++;

 				item.add(new Label("comma", ",").setVisible(counter < owners.size()));