You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/09/03 19:15:54 UTC

[1/2] git commit: [#6457] Save result of mount_point validation

Updated Branches:
  refs/heads/master ddac2b664 -> faa5a9e8a


[#6457] Save result of mount_point validation

- Allows validator to return an alternate mount_point if the one
  passed in is already in use.

Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/faa5a9e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/faa5a9e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/faa5a9e8

Branch: refs/heads/master
Commit: faa5a9e8af6ef73fcee30f9735f5c695c9943265
Parents: 9a4a8dd
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Aug 28 16:56:26 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Sep 3 17:05:08 2013 +0000

----------------------------------------------------------------------
 ForgeImporters/forgeimporters/google/code.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/faa5a9e8/ForgeImporters/forgeimporters/google/code.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/code.py b/ForgeImporters/forgeimporters/google/code.py
index 60a0158..ed2519f 100644
--- a/ForgeImporters/forgeimporters/google/code.py
+++ b/ForgeImporters/forgeimporters/google/code.py
@@ -109,7 +109,7 @@ class GoogleRepoImportForm(fe.schema.Schema):
             raise
         tool_class = REPO_APPS[repo_type]
         try:
-            v.MountPointValidator(tool_class).to_python(mount_point)
+            value['mount_point'] = v.MountPointValidator(tool_class).to_python(mount_point)
         except fe.Invalid as e:
             raise fe.Invalid('mount_point:' + str(e), value, state)
         return value


[2/2] git commit: [#6457] Make way for extending tmpl to hide mount fields

Posted by br...@apache.org.
[#6457] Make way for extending tmpl to hide mount fields

Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/9a4a8dd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/9a4a8dd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/9a4a8dd5

Branch: refs/heads/master
Commit: 9a4a8dd53d9aaa1c91a6bd903b1a49c644cb3278
Parents: ddac2b6
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Aug 28 16:54:52 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Sep 3 17:05:08 2013 +0000

----------------------------------------------------------------------
 ForgeImporters/forgeimporters/templates/importer_base.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9a4a8dd5/ForgeImporters/forgeimporters/templates/importer_base.html
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/templates/importer_base.html b/ForgeImporters/forgeimporters/templates/importer_base.html
index 7a25543..b97eedf 100644
--- a/ForgeImporters/forgeimporters/templates/importer_base.html
+++ b/ForgeImporters/forgeimporters/templates/importer_base.html
@@ -64,6 +64,7 @@
 <form action="create" method="post" enctype="multipart/form-data">
   {% block importer_fields %}
   {% endblock %}
+  {% if not show_mount_fields is defined or show_mount_fields %}
   <div>
     <label for="mount_label">Label</label>
     <input name="mount_label" value="{{ c.form_values['mount_label'] or target_app.default_mount_label }}" />
@@ -74,7 +75,7 @@
     <input name="mount_point" value="{{ c.form_values['mount_point'] or target_app.default_mount_point }}" />
       {{ error('mount_point') }}
   </div>
-
+  {% endif %}
   <input type="submit" value="Import"/>
 </form>
 {% endblock %}