From b7b8f93261420aaa321948b1508f2cd8a6e0b297 Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Sun, 11 Jul 2010 00:03:39 -0400 Subject: Removing references to snakeplan in imports. --- snakeplan/accounts/admin.py | 2 +- snakeplan/accounts/views.py | 1 - snakeplan/projects/admin.py | 2 +- snakeplan/projects/urls.py | 14 +++++----- snakeplan/projects/views/iterations.py | 4 +-- snakeplan/projects/views/project.py | 49 ++++++++++++++++++++++++++++++++++ snakeplan/projects/views/projects.py | 49 ---------------------------------- snakeplan/projects/views/stories.py | 4 +-- snakeplan/projects/views/tasks.py | 4 +-- 9 files changed, 64 insertions(+), 65 deletions(-) delete mode 100644 snakeplan/accounts/views.py create mode 100644 snakeplan/projects/views/project.py delete mode 100644 snakeplan/projects/views/projects.py diff --git a/snakeplan/accounts/admin.py b/snakeplan/accounts/admin.py index a7ce6ef..498b5e1 100644 --- a/snakeplan/accounts/admin.py +++ b/snakeplan/accounts/admin.py @@ -18,7 +18,7 @@ SnakePlan Admin Setup # See the License for the specific language governing permissions and # limitations under the License. -from snakeplan.accounts import models +import models from django.contrib import admin admin.site.register(models.UserProfile) diff --git a/snakeplan/accounts/views.py b/snakeplan/accounts/views.py deleted file mode 100644 index 60f00ef..0000000 --- a/snakeplan/accounts/views.py +++ /dev/null @@ -1 +0,0 @@ -# Create your views here. diff --git a/snakeplan/projects/admin.py b/snakeplan/projects/admin.py index 981e4e5..ba56193 100644 --- a/snakeplan/projects/admin.py +++ b/snakeplan/projects/admin.py @@ -18,7 +18,7 @@ SnakePlan Admin Setup # See the License for the specific language governing permissions and # limitations under the License. -from snakeplan.projects import models +import models from django.contrib.admin import ModelAdmin, site diff --git a/snakeplan/projects/urls.py b/snakeplan/projects/urls.py index 7f47d04..c59024c 100644 --- a/snakeplan/projects/urls.py +++ b/snakeplan/projects/urls.py @@ -21,17 +21,17 @@ SnakePlan Project Urls from django.conf.urls.defaults import patterns, url -urlpatterns = patterns('snakeplan.projects.views', - url(r'^$', 'projects.index', name='project-list'), +urlpatterns = patterns('projects.views', + url(r'^$', 'project.index', name='project-list'), # Projects - url(r'^create/', 'projects.create_project', name='create-project'), - url(r'^(\d+)/edit/', 'projects.update_project', name='edit-project'), - url(r'^(\d+)/', 'projects.project_iterations', name='project-iterations'), + url(r'^create/', 'project.create_project', name='create-project'), + url(r'^(\d+)/edit/', 'project.update_project', name='edit-project'), + url(r'^(\d+)/', 'project.project_iterations', name='project-iterations'), # Iterations - url(r'^(\d+)/iterations/(\d+)/', 'projects.index'), + url(r'^(\d+)/iterations/(\d+)/', 'project.index'), # Stories - url(r'^(\d+)/stories/(\d+)/', 'projects.index', name='iteration-stories'), + url(r'^(\d+)/stories/(\d+)/', 'project.index', name='iteration-stories'), ) diff --git a/snakeplan/projects/views/iterations.py b/snakeplan/projects/views/iterations.py index eae5c89..1f55532 100644 --- a/snakeplan/projects/views/iterations.py +++ b/snakeplan/projects/views/iterations.py @@ -1,6 +1,6 @@ from django.views.generic import list_detail -from snakeplan.projects.models import Iteration -from snakeplan.projects.models import Story +from projects.models import Iteration +from projects.models import Story def index(request, iteration_id): stories = Story.objects.filter(iteration=iteration_id) diff --git a/snakeplan/projects/views/project.py b/snakeplan/projects/views/project.py new file mode 100644 index 0000000..29f037f --- /dev/null +++ b/snakeplan/projects/views/project.py @@ -0,0 +1,49 @@ +# vim: set filencoding=utf8 +""" +Project Views + +@author: Mike Crute (mcrute@gmail.com) +@organization: SoftGroup Interactive, Inc. +@date: July 10, 2010 +""" + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from django.views.generic import list_detail, create_update +from django.core.urlresolvers import reverse + +from projects.models import Project, Iteration + + +def index(request): + return list_detail.object_list(request, + queryset=Project.objects.order_by('-active', 'name').all()) + + +def project_iterations(request, project_id): + project = Project.objects.get(id=project_id) + + return list_detail.object_list(request, + extra_context={'project_name': project.name }, + queryset=project.iteration_set.all()) + + +def create_project(request): + return create_update.create_object(request, model=Project, + post_save_redirect=reverse('project-list')) + + +def update_project(request, project_id): + return create_update.update_object(request, model=Project, + object_id=project_id, + post_save_redirect=reverse('project-list')) diff --git a/snakeplan/projects/views/projects.py b/snakeplan/projects/views/projects.py deleted file mode 100644 index ca61cf5..0000000 --- a/snakeplan/projects/views/projects.py +++ /dev/null @@ -1,49 +0,0 @@ -# vim: set filencoding=utf8 -""" -Project Views - -@author: Mike Crute (mcrute@gmail.com) -@organization: SoftGroup Interactive, Inc. -@date: July 10, 2010 -""" - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from django.views.generic import list_detail, create_update -from django.core.urlresolvers import reverse - -from ..models import Project, Iteration - - -def index(request): - return list_detail.object_list(request, - queryset=Project.objects.order_by('-active', 'name').all()) - - -def project_iterations(request, project_id): - project = Project.objects.get(id=project_id) - - return list_detail.object_list(request, - extra_context={'project_name': project.name }, - queryset=project.iteration_set.all()) - - -def create_project(request): - return create_update.create_object(request, model=Project, - post_save_redirect=reverse('project-list')) - - -def update_project(request, project_id): - return create_update.update_object(request, model=Project, - object_id=project_id, - post_save_redirect=reverse('project-list')) diff --git a/snakeplan/projects/views/stories.py b/snakeplan/projects/views/stories.py index 504d930..93d926f 100644 --- a/snakeplan/projects/views/stories.py +++ b/snakeplan/projects/views/stories.py @@ -1,6 +1,6 @@ from django.views.generic import list_detail -from snakeplan.projects.models import Story -from snakeplan.projects.models import Task +from projects.models import Story +from projects.models import Task def index(request, story_id): diff --git a/snakeplan/projects/views/tasks.py b/snakeplan/projects/views/tasks.py index 8e74cfa..4719da2 100644 --- a/snakeplan/projects/views/tasks.py +++ b/snakeplan/projects/views/tasks.py @@ -1,6 +1,6 @@ from django.views.generic import list_detail -import snakeplan.projects.models as sp_models -from snakeplan.projects.models import Task +import projects.models as sp_models +from projects.models import Task def index(request, task_id): -- cgit v1.2.3