|
a/Allura/allura/controllers/project.py |
|
b/Allura/allura/controllers/project.py |
|
... |
|
... |
| 146 |
except forge_exc.ProjectConflict:
|
146 |
except forge_exc.ProjectConflict:
|
| 147 |
flash(
|
147 |
flash(
|
| 148 |
'A project already exists with that name, please choose another.', 'error')
|
148 |
'A project already exists with that name, please choose another.', 'error')
|
| 149 |
ming.orm.ormsession.ThreadLocalORMSession.close_all()
|
149 |
ming.orm.ormsession.ThreadLocalORMSession.close_all()
|
| 150 |
redirect('add_project?project_unixname=%s&project_description=%s&project_name=%s' %
|
150 |
redirect('add_project?project_unixname=%s&project_description=%s&project_name=%s' %
|
| 151 |
(quote(project_unixname),quote(project_description),quote(project_name)))
|
151 |
(quote(project_unixname or ''),quote(project_description or ''),quote(project_name or '')))
|
| 152 |
except Exception, ex:
|
152 |
except Exception, ex:
|
| 153 |
c.project = None
|
153 |
c.project = None
|
| 154 |
ming.orm.ormsession.ThreadLocalORMSession.close_all()
|
154 |
ming.orm.ormsession.ThreadLocalORMSession.close_all()
|
| 155 |
flash('%s: %s' % (ex.__class__, str(ex)), 'error')
|
155 |
flash('%s: %s' % (ex.__class__, str(ex)), 'error')
|
| 156 |
redirect('add_project?project_unixname=%s&project_description=%s&project_name=%s' %
|
156 |
redirect('add_project?project_unixname=%s&project_description=%s&project_name=%s' %
|
| 157 |
(quote(project_unixname),quote(project_description),quote(project_name)))
|
157 |
(quote(project_unixname or ''),quote(project_description or ''),quote(project_name or '')))
|
| 158 |
if project_name:
|
158 |
if project_name:
|
| 159 |
p.name = project_name
|
159 |
p.name = project_name
|
| 160 |
if project_description:
|
160 |
if project_description:
|
| 161 |
p.short_description = project_description
|
161 |
p.short_description = project_description
|
| 162 |
c.project = p
|
162 |
c.project = p
|