From ef4a4558ee259e64b1038b69505556a248eeb775 Mon Sep 17 00:00:00 2001
From: John Crygier <john.crygier@aon.com>
Date: Fri, 04 May 2012 14:24:01 -0400
Subject: [PATCH] Web UI done for Custom Fields. Changed variable names to be consistent with "custom" instead of "user"
---
src/com/gitblit/wicket/pages/EditRepositoryPage.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index af1b2b4..13b9e5a 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -16,6 +16,7 @@
package com.gitblit.wicket.pages;
import java.text.MessageFormat;
+import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -23,26 +24,32 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.apache.wicket.PageParameters;
import org.apache.wicket.behavior.SimpleAttributeModifier;
import org.apache.wicket.extensions.markup.html.form.palette.Palette;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListItemModel;
+import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.util.CollectionModel;
import org.apache.wicket.model.util.ListModel;
+import com.gitblit.Constants;
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.FederationStrategy;
-import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.GitBlitException;
import com.gitblit.Keys;
@@ -149,6 +156,26 @@
new ListModel<String>(postReceiveScripts), new CollectionModel<String>(GitBlit
.self().getPostReceiveScriptsUnused(repositoryModel)),
new StringChoiceRenderer(), 12, true);
+
+ // Dynamic Custom Defined Properties Properties
+ final List<Entry<String, String>> definedProperties = new ArrayList<Entry<String, String>>();
+ List<String> customFields = GitBlit.getStrings(Keys.repository.customFields);
+ for (String customFieldDef : customFields) {
+ String[] customFieldProperty = customFieldDef.split("=");
+ definedProperties.add(new AbstractMap.SimpleEntry<String, String>(customFieldProperty[0], customFieldProperty[1]));
+ }
+
+ final ListView<Entry<String, String>> customDefinedProperties = new ListView<Entry<String, String>>("customDefinedProperties", definedProperties) {
+ @Override
+ protected void populateItem(ListItem<Entry<String, String>> item) {
+ String value = repositoryModel.customDefinedProperties.get(item.getModelObject().getKey());
+
+ item.add(new Label(item.getModelObject().getKey(), item.getModelObject().getValue())); // Used to get the key later
+ item.add(new Label("customLabel", item.getModelObject().getValue()));
+ item.add(new TextField<String>("customValue", new Model<String>(value)));
+ }
+ };
+ customDefinedProperties.setReuseItems(true);
CompoundPropertyModel<RepositoryModel> model = new CompoundPropertyModel<RepositoryModel>(
repositoryModel);
@@ -249,7 +276,16 @@
postReceiveScripts.add(post.next());
}
repositoryModel.postReceiveScripts = postReceiveScripts;
-
+
+ // Loop over each of the user defined properties
+ for (int i = 0; i < customDefinedProperties.size(); i++) {
+ ListItem<ListItemModel<String>> item = (ListItem<ListItemModel<String>>) customDefinedProperties.get(i);
+ String key = item.get(0).getId(); // Item 0 is our 'fake' label
+ String value = ((TextField<String>)item.get(2)).getValue(); // Item 2 is out text box
+
+ repositoryModel.customDefinedProperties.put(key, value);
+ }
+
// save the repository
GitBlit.self().updateRepositoryModel(oldName, repositoryModel, isCreate);
@@ -334,6 +370,14 @@
form.add(postReceivePalette);
form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self()
.getPostReceiveScriptsInherited(repositoryModel)));
+
+ WebMarkupContainer customDefinedPropertiesSection = new WebMarkupContainer("customDefinedPropertiesSection") {
+ public boolean isVisible() {
+ return GitBlit.getString(Keys.repository.customFields, "").isEmpty() == false;
+ };
+ };
+ customDefinedPropertiesSection.add(customDefinedProperties);
+ form.add(customDefinedPropertiesSection);
form.add(new Button("save"));
Button cancel = new Button("cancel") {
--
Gitblit v1.9.1