From: John Crygier Date: Fri, 4 May 2012 18:24:01 +0000 (-0500) Subject: Web UI done for Custom Fields. Changed variable names to be consistent with "custom... X-Git-Tag: v1.0.0~53^2~3 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ef4a4558ee259e64b1038b69505556a248eeb775;p=gitblit.git Web UI done for Custom Fields. Changed variable names to be consistent with "custom" instead of "user" --- diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties index 8bfa417e..e04f2c8f 100644 --- a/distrib/gitblit.properties +++ b/distrib/gitblit.properties @@ -816,3 +816,13 @@ server.storePassword = gitblit # SINCE 0.5.0 # RESTART REQUIRED server.shutdownPort = 8081 + +# Custom Defined Properties for Repositories +# Space delimited (use quotes if labels have spaces) list of custom properties +# to show up on the "Edit Repository" page, with labels. Thes custom properties will +# then be available for hooks. +# +# E.g. "commit-msg-regex=Commit Message Regualar Expression" another-property=Another +# +# SINCE 1.0.0 +repository.customFields = \ No newline at end of file diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index a95e4f74..8ba080af 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -859,9 +859,9 @@ public class GitBlit implements ServletContextListener { "gitblit", null, "indexBranch"))); // Custom defined properties - model.userDefinedProperties = new HashMap(); + model.customDefinedProperties = new HashMap(); for (String aProperty : config.getNames(Constants.CUSTOM_DEFINED_PROP_SECTION, Constants.CUSTOM_DEFINED_PROP_SUBSECTION)) { - model.userDefinedProperties.put(aProperty, config.getString(Constants.CUSTOM_DEFINED_PROP_SECTION, Constants.CUSTOM_DEFINED_PROP_SUBSECTION, aProperty)); + model.customDefinedProperties.put(aProperty, config.getString(Constants.CUSTOM_DEFINED_PROP_SECTION, Constants.CUSTOM_DEFINED_PROP_SUBSECTION, aProperty)); } } model.HEAD = JGitUtils.getHEADRef(r); @@ -1111,7 +1111,7 @@ public class GitBlit implements ServletContextListener { updateList(config, "indexBranch", repository.indexedBranches); // User Defined Properties - for (Entry singleProperty : repository.userDefinedProperties.entrySet()) { + for (Entry singleProperty : repository.customDefinedProperties.entrySet()) { config.setString(Constants.CUSTOM_DEFINED_PROP_SECTION, Constants.CUSTOM_DEFINED_PROP_SUBSECTION, singleProperty.getKey(), singleProperty.getValue()); } diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java index 539aa513..92fc2373 100644 --- a/src/com/gitblit/models/RepositoryModel.java +++ b/src/com/gitblit/models/RepositoryModel.java @@ -64,7 +64,7 @@ public class RepositoryModel implements Serializable, Comparable preReceiveScripts; public List postReceiveScripts; public List mailingLists; - public Map userDefinedProperties; + public Map customDefinedProperties; private String displayName; public RepositoryModel() { diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index 57ccd68f..b96a32ed 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -202,6 +202,8 @@ gb.mailingLists = mailing lists gb.preReceiveScripts = pre-receive scripts gb.postReceiveScripts = post-receive scripts gb.hookScripts = hook scripts +gb.customDefinedProperties = custom defined properties +gb.customDefinedPropertiesDescription = custom properties available to groovy hooks gb.accessPermissions = access permissions gb.filters = filters gb.generalDescription = common settings diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/com/gitblit/wicket/pages/EditRepositoryPage.html index d84573ec..e144f382 100644 --- a/src/com/gitblit/wicket/pages/EditRepositoryPage.html +++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.html @@ -36,7 +36,11 @@

 

-
 
+
+

 

+ +
+
 
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java index af1b2b44..13b9e5a6 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.HashSet; 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 @@ public class EditRepositoryPage extends RootSubPage { new ListModel(postReceiveScripts), new CollectionModel(GitBlit .self().getPostReceiveScriptsUnused(repositoryModel)), new StringChoiceRenderer(), 12, true); + + // Dynamic Custom Defined Properties Properties + final List> definedProperties = new ArrayList>(); + List customFields = GitBlit.getStrings(Keys.repository.customFields); + for (String customFieldDef : customFields) { + String[] customFieldProperty = customFieldDef.split("="); + definedProperties.add(new AbstractMap.SimpleEntry(customFieldProperty[0], customFieldProperty[1])); + } + + final ListView> customDefinedProperties = new ListView>("customDefinedProperties", definedProperties) { + @Override + protected void populateItem(ListItem> 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("customValue", new Model(value))); + } + }; + customDefinedProperties.setReuseItems(true); CompoundPropertyModel model = new CompoundPropertyModel( repositoryModel); @@ -249,7 +276,16 @@ public class EditRepositoryPage extends RootSubPage { postReceiveScripts.add(post.next()); } repositoryModel.postReceiveScripts = postReceiveScripts; - + + // Loop over each of the user defined properties + for (int i = 0; i < customDefinedProperties.size(); i++) { + ListItem> item = (ListItem>) customDefinedProperties.get(i); + String key = item.get(0).getId(); // Item 0 is our 'fake' label + String value = ((TextField)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 @@ public class EditRepositoryPage extends RootSubPage { 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") { diff --git a/tests/com/gitblit/tests/RepositoryModelTest.java b/tests/com/gitblit/tests/RepositoryModelTest.java index f7418152..611ed295 100644 --- a/tests/com/gitblit/tests/RepositoryModelTest.java +++ b/tests/com/gitblit/tests/RepositoryModelTest.java @@ -67,8 +67,8 @@ public class RepositoryModelTest { RepositoryModel model = GitBlit.self().getRepositoryModel( GitBlitSuite.getHelloworldRepository().getDirectory().getName()); - assertEquals("\\d", model.userDefinedProperties.get("commitMessageRegEx")); - assertEquals("Hello", model.userDefinedProperties.get("anotherProperty")); + assertEquals("\\d", model.customDefinedProperties.get("commitMessageRegEx")); + assertEquals("Hello", model.customDefinedProperties.get("anotherProperty")); } @Test @@ -76,17 +76,17 @@ public class RepositoryModelTest { RepositoryModel model = GitBlit.self().getRepositoryModel( GitBlitSuite.getHelloworldRepository().getDirectory().getName()); - assertEquals("\\d", model.userDefinedProperties.get("commitMessageRegEx")); - assertEquals("Hello", model.userDefinedProperties.get("anotherProperty")); + assertEquals("\\d", model.customDefinedProperties.get("commitMessageRegEx")); + assertEquals("Hello", model.customDefinedProperties.get("anotherProperty")); - assertEquals("Hello", model.userDefinedProperties.put("anotherProperty", "GoodBye")); + assertEquals("Hello", model.customDefinedProperties.put("anotherProperty", "GoodBye")); GitBlit.self().updateRepositoryModel(model.name, model, false); model = GitBlit.self().getRepositoryModel( GitBlitSuite.getHelloworldRepository().getDirectory().getName()); - assertEquals("\\d", model.userDefinedProperties.get("commitMessageRegEx")); - assertEquals("GoodBye", model.userDefinedProperties.get("anotherProperty")); + assertEquals("\\d", model.customDefinedProperties.get("commitMessageRegEx")); + assertEquals("GoodBye", model.customDefinedProperties.get("anotherProperty")); } }