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/09/09 16:02:37 UTC
[2/6] git commit: [#6533] ticket:422 fixed github code import
[#6533] ticket:422 fixed github code import
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/49174c66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/49174c66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/49174c66
Branch: refs/heads/master
Commit: 49174c66d7ed8216242c056b10673617b9714338
Parents: 7e720e7
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Thu Sep 5 16:41:43 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Mon Sep 9 14:02:08 2013 +0000
----------------------------------------------------------------------
ForgeImporters/forgeimporters/github/code.py | 5 +++--
.../forgeimporters/github/templates/code/index.html | 14 ++++++++------
2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/49174c66/ForgeImporters/forgeimporters/github/code.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/code.py b/ForgeImporters/forgeimporters/github/code.py
index 1ed516a..9035472 100644
--- a/ForgeImporters/forgeimporters/github/code.py
+++ b/ForgeImporters/forgeimporters/github/code.py
@@ -61,7 +61,7 @@ class GitHubRepoImportForm(fe.schema.Schema):
value = super(self.__class__, self)._to_python(value, state)
mount_point = value['mount_point']
try:
- v.MountPointValidator('git').to_python(mount_point)
+ v.MountPointValidator(ForgeGitApp).to_python(mount_point)
except fe.Invalid as e:
raise fe.Invalid('mount_point:' + str(e), value, state)
return value
@@ -76,7 +76,7 @@ class GitHubRepoImportController(BaseController):
return self.importer.target_app[0]
@with_trailing_slash
- @expose('jinja:forgeimporters.google:templates/code/index.html')
+ @expose('jinja:forgeimporters.github:templates/code/index.html')
def index(self, **kw):
return dict(importer=self.importer,
target_app=self.target_app)
@@ -100,6 +100,7 @@ class GitHubRepoImportController(BaseController):
class GitHubRepoImporter(ToolImporter):
target_app = TARGET_APPS
source = 'GitHub'
+ controller = GitHubRepoImportController
tool_label = 'Source Code'
tool_description = 'Import your repo from GitHub'
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/49174c66/ForgeImporters/forgeimporters/github/templates/code/index.html
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/templates/code/index.html b/ForgeImporters/forgeimporters/github/templates/code/index.html
index 5bf7f0c..e659061 100644
--- a/ForgeImporters/forgeimporters/github/templates/code/index.html
+++ b/ForgeImporters/forgeimporters/github/templates/code/index.html
@@ -24,12 +24,14 @@
{% block importer_fields %}
<div>
- <label for="gc_project_name">GitHub User Name</label>
- <input name="gc_project_name" value="{{ c.form_values['gc_project_name'] }}" />
- {{ error('gc_project_name') }}
- <label for="gc_project_name">GitHub Project Name</label>
- <input name="gc_project_name" value="{{ c.form_values['gc_project_name'] }}" />
- {{ error('gc_project_name') }}
+ <label for="gh_user_name">GitHub User Name</label>
+ <input name="gh_user_name" value="{{ c.form_values['gh_user_name'] }}" />
+ {{ error('gh_user_name') }}
+</div>
+<div>
+ <label for="gh_project_name">GitHub Project Name</label>
+ <input name="gh_project_name" value="{{ c.form_values['gh_project_name'] }}" />
+ {{ error('gh_project_name') }}
</div>
{% endblock %}
\ No newline at end of file