allura
| リビジョン | 6de70c4c37748f259f646cdeb350fae4d6921869 (tree) |
|---|---|
| 日時 | 2012-05-17 04:06:46 |
| 作者 | Eugene “Stilgar“ Gilewski <developer@gile...> |
| コミッター | Cory Johns |
ticket:42: Added new field to fork page for custom mount label.
Allura/allura/controllers/repository.py (diff)
Allura/allura/templates/repo/fork.html (diff)| @@ -61,7 +61,7 @@ class RepoRootController(BaseController): | ||
| 61 | 61 | |
| 62 | 62 | @with_trailing_slash |
| 63 | 63 | @expose('jinja:allura:templates/repo/fork.html') |
| 64 | - def fork(self, to_name=None, project_id=None): | |
| 64 | + def fork(self, to_name=None, project_id=None, mount_label=None): | |
| 65 | 65 | # this shows the form and handles the submission |
| 66 | 66 | security.require_authenticated() |
| 67 | 67 | if not c.app.forkable: raise exc.HTTPNotFound |
| @@ -70,10 +70,12 @@ class RepoRootController(BaseController): | ||
| 70 | 70 | ThreadLocalORMSession.close_all() |
| 71 | 71 | from_project = c.project |
| 72 | 72 | to_project = M.Project.query.get(_id=ObjectId(project_id)) |
| 73 | + mount_label = mount_label or '%s - Code' % c.project.name | |
| 73 | 74 | if request.method != 'POST' or not to_name: |
| 74 | 75 | return dict(from_repo=from_repo, |
| 75 | 76 | user_project=c.user.private_project(), |
| 76 | - to_name=to_name or '') | |
| 77 | + to_name=to_name or '', | |
| 78 | + mount_label=mount_label) | |
| 77 | 79 | else: |
| 78 | 80 | with h.push_config(c, project=to_project): |
| 79 | 81 | if not to_project.database_configured: |
| @@ -81,7 +83,9 @@ class RepoRootController(BaseController): | ||
| 81 | 83 | security.require(security.has_access(to_project, 'admin')) |
| 82 | 84 | try: |
| 83 | 85 | to_project.install_app( |
| 84 | - from_repo.tool_name, to_name, | |
| 86 | + ep_name=from_repo.tool_name, | |
| 87 | + mount_point=to_name, | |
| 88 | + mount_label=mount_label, | |
| 85 | 89 | cloned_from_project_id=from_project._id, |
| 86 | 90 | cloned_from_repo_id=from_repo._id) |
| 87 | 91 | redirect(to_project.url()+to_name+'/') |
| @@ -20,6 +20,10 @@ | ||
| 20 | 20 | <div class="grid-15"> |
| 21 | 21 | <input type="text" name="to_name" value="{{to_name}}"/> |
| 22 | 22 | </div> |
| 23 | + <label class="grid-4" for="mount_label">Mount label:</label> | |
| 24 | + <div class="grid-15"> | |
| 25 | + <input type="text" name="mount_label" value="{{mount_label}}"/> | |
| 26 | + </div> | |
| 23 | 27 | <label class="grid-4"> </label> |
| 24 | 28 | <div class="grid-15"> |
| 25 | 29 | <input type="submit" value="Fork"/> |
sado
Fork
allura