From 043e633c1d39c9debdec5989bcb4769097121367 Mon Sep 17 00:00:00 2001 From: panjunyong Date: Tue, 15 Dec 2015 18:05:55 +0800 Subject: [PATCH 1/4] remove python --- zh/django_admin/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/zh/django_admin/README.md b/zh/django_admin/README.md index 8d3417fbca4..6814957015c 100755 --- a/zh/django_admin/README.md +++ b/zh/django_admin/README.md @@ -4,7 +4,6 @@ 让我们打开`blog/admin.py`文件，并替换其中的文件像这样： - python from django.contrib import admin from .models import Post @@ -45,4 +44,4 @@ OK, 现在来看看我们的 Post 模型。 记得先在控制台输入`python m 如果你向更多地了解Django admin模块，你可以查看Django 的官方文档:https://docs.djangoproject.com/en/1.8/ref/contrib/admin/ -现在你可以来杯咖啡(或者是茶) 或吃点东西给自己充下电，你刚刚创建了你的第一个Django模型，这是你应得的。 \ No newline at end of file +现在你可以来杯咖啡(或者是茶) 或吃点东西给自己充下电，你刚刚创建了你的第一个Django模型，这是你应得的。 From 2faee0e4b119dddf0ad89d546ed930449c9d9d0a Mon Sep 17 00:00:00 2001 From: panjunyong Date: Tue, 15 Dec 2015 18:07:53 +0800 Subject: [PATCH 2/4] fix python --- zh/django_admin/README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/zh/django_admin/README.md b/zh/django_admin/README.md index 6814957015c..63312733c42 100755 --- a/zh/django_admin/README.md +++ b/zh/django_admin/README.md @@ -4,11 +4,12 @@ 让我们打开`blog/admin.py`文件，并替换其中的文件像这样： - from django.contrib import admin - from .models import Post - - admin.site.register(Post) - +```python +from django.contrib import admin +from .models import Post + +admin.site.register(Post) +``` 如你所见，我们导入（包括）了前一章定义的Post模型。 为了让我们的模型在admin页面上可见，我们需要使用`admin.site.register(Post)`来注册模型. From 62ea5a7d1b426bf7af688c635aa44624a3af164e Mon Sep 17 00:00:00 2001 From: panjunyong Date: Tue, 15 Dec 2015 18:12:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4python=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zh/django_forms/README.md | 98 +++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/zh/django_forms/README.md b/zh/django_forms/README.md index 7ac3dfcfaf2..13a94f94042 100755 --- a/zh/django_forms/README.md +++ b/zh/django_forms/README.md @@ -19,15 +19,15 @@ Django表单的一个好处就是我们既可以从零开始自定义，也可 好吧，让我们打开它，然后键入以下代码： ```python - from django import forms - - from .models import Post - - class PostForm(forms.ModelForm): - - class Meta: - model = Post - fields = ('title', 'text',) +from django import forms + +from .models import Post + +class PostForm(forms.ModelForm): + + class Meta: + model = Post + fields = ('title', 'text',) ``` @@ -98,14 +98,14 @@ Django表单的一个好处就是我们既可以从零开始自定义，也可 最终代码会看起来像这样： ```python - from django.conf.urls import include, url - from . import views - - urlpatterns = [ - url(r'^$', views.post_list, name='post_list'), - url(r'^post/(?P[0-9]+)/$', views.post_detail, name='post_detail'), - url(r'^post/new/$', views.post_new, name='post_new'), - ] +from django.conf.urls import include, url +from . import views + +urlpatterns = [ + url(r'^$', views.post_list, name='post_list'), + url(r'^post/(?P[0-9]+)/$', views.post_detail, name='post_detail'), + url(r'^post/new/$', views.post_new, name='post_new'), +] ``` @@ -116,16 +116,16 @@ Django表单的一个好处就是我们既可以从零开始自定义，也可 现在打开`blog/views.py`文件，加入下面的各行到`from`行下： ```python - from .forms import PostForm +from .forms import PostForm ``` 还有我们的*view*： ```python - def post_new(request): - form = PostForm() - return render(request, 'blog/post_edit.html', {'form': form}) +def post_new(request): + form = PostForm() + return render(request, 'blog/post_edit.html', {'form': form}) ``` @@ -176,9 +176,9 @@ Django表单的一个好处就是我们既可以从零开始自定义，也可 再一次打开`blog/views,py`。我们在看到`post_new`中的视图内容是: ```python - def post_new(request): - form = PostForm() - return render(request, 'blog/post_edit.html', {'form': form}) +def post_new(request): + form = PostForm() + return render(request, 'blog/post_edit.html', {'form': form}) ``` @@ -235,18 +235,18 @@ Django表单的一个好处就是我们既可以从零开始自定义，也可 好吧，我们已经说了很多了，但可能我们想看到整个*视图*现在看起来什么样，对吗？ ```python - def post_new(request): - if request.method == "POST": - form = PostForm(request.POST) - if form.is_valid(): - post = form.save(commit=False) - post.author = request.user - post.published_date = timezone.now() - post.save() - return redirect('blog.views.post_detail', pk=post.pk) - else: - form = PostForm() - return render(request, 'blog/post_edit.html', {'form': form}) +def post_new(request): + if request.method == "POST": + form = PostForm(request.POST) + if form.is_valid(): + post = form.save(commit=False) + post.author = request.user + post.published_date = timezone.now() + post.save() + return redirect('blog.views.post_detail', pk=post.pk) + else: + form = PostForm() + return render(request, 'blog/post_edit.html', {'form': form}) ``` @@ -317,19 +317,19 @@ Django会处理验证我们表单里的所有字段都是正确的。这不是 让我们打开`blog/views.py`，并在文件的最后加入： ```python - def post_edit(request, pk): - post = get_object_or_404(Post, pk=pk) - if request.method == "POST": - form = PostForm(request.POST, instance=post) - if form.is_valid(): - post = form.save(commit=False) - post.author = request.user - post.published_date = timezone.now() - post.save() - return redirect('blog.views.post_detail', pk=post.pk) - else: - form = PostForm(instance=post) - return render(request, 'blog/post_edit.html', {'form': form}) +def post_edit(request, pk): + post = get_object_or_404(Post, pk=pk) + if request.method == "POST": + form = PostForm(request.POST, instance=post) + if form.is_valid(): + post = form.save(commit=False) + post.author = request.user + post.published_date = timezone.now() + post.save() + return redirect('blog.views.post_detail', pk=post.pk) + else: + form = PostForm(instance=post) + return render(request, 'blog/post_edit.html', {'form': form}) ``` From 6126eea53089386b36f47dd8cf9240b31e33164e Mon Sep 17 00:00:00 2001 From: panjunyong Date: Tue, 15 Dec 2015 18:14:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4python=E7=9A=84=E7=BC=A9?= =?UTF-8?q?=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zh/extend_your_application/README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/zh/extend_your_application/README.md b/zh/extend_your_application/README.md index 7221e96966d..ba81d21bd33 100755 --- a/zh/extend_your_application/README.md +++ b/zh/extend_your_application/README.md @@ -56,13 +56,13 @@ 让我们在 `blog/urls.py` 文件中增加一个 URL 来指引 Django 到名为 `post_detail` 的 *view*，它将用来显示整篇博客文章。 增加这行 `url(r'^post/(?P[0-9]+)/$', views.post_detail, name='post_detail'),` 到 `blog/urls.py` 文件。 文件应当如下所示： ```python - from django.conf.urls import include, url - from . import views - - urlpatterns = [ - url(r'^$', views.post_list, name='post_list'), - url(r'^post/(?P[0-9]+)/$', views.post_detail, name='post_detail'), - ] +from django.conf.urls import include, url +from . import views + +urlpatterns = [ + url(r'^$', views.post_list, name='post_list'), + url(r'^post/(?P[0-9]+)/$', views.post_detail, name='post_detail'), +] ``` @@ -117,9 +117,9 @@ 在 `from`附近 行。并在文件的末尾，我们将增加我们的 *view*： ```python - def post_detail(request, pk): - post = get_object_or_404(Post, pk=pk) - return render(request, 'blog/post_detail.html', {'post': post}) +def post_detail(request, pk): + post = get_object_or_404(Post, pk=pk) + return render(request, 'blog/post_detail.html', {'post': post}) ```