You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/08/28 18:56:40 UTC
[1/2] git commit: [#6457] Make way for extending tmpl to hide mount
fields
Updated Branches:
refs/heads/tv/6457 [created] 04851fa4c
[#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/fc6a6647
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/fc6a6647
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/fc6a6647
Branch: refs/heads/tv/6457
Commit: fc6a6647b454027a3f1332cb4f8121633cb62f34
Parents: eceab84
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Aug 28 16:54:52 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Aug 28 16:54:52 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/fc6a6647/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 %}
[2/2] git commit: [#6457] Save result of mount_point validation
Posted by tv...@apache.org.
[#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/04851fa4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/04851fa4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/04851fa4
Branch: refs/heads/tv/6457
Commit: 04851fa4c7e29e5a76b116ec530554a2ed393dad
Parents: fc6a664
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Aug 28 16:56:26 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Aug 28 16:56:26 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/04851fa4/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