Merge pull request douban#41 from dongweiming/bugfix_when_project_has_exists

xtao · xtao · commit e679f4bac623 · 2014-02-22T17:08:49.000+08:00
Bugfix: Create project but project has exists
diff --git a/vilya/templates/errors/common.html b/vilya/templates/errors/common.html
@@ -0,0 +1,5 @@
+<%inherit file="/layouts/base.html" />
+
+<div style="text-align: center;">
+  <p>"${error}"</p>
+</div>
diff --git a/vilya/views/projects/__init__.py b/vilya/views/projects/__init__.py
@@ -24,8 +24,15 @@ def _q_index(request):
                         creator_id=current_user.id)
         if p:
             return request.redirect('%s' % p.repo_name)
-        context['project'] = p
-        return st('projects/index.html', **context)
+        has_proj = Project.get_by_name_and_owner(name, current_user.id)
+        default_error = 'Create Failure. Please contact the administrator!'
+        if has_proj is not None:
+            context['error'] = 'Project has exists, Please confirm!'
+        else:
+            context['error'] = default_error
+        context['current_user'] = current_user
+        return st('/errors/common.html', **context)
+
     projects = Project.gets_by()
     context['projects'] = projects
     context['current_user'] = current_user
