← Back to branch summary

~widelands-dev/widelands-website/django_staticfiles

« back to all changes in this revision

Viewing changes to wiki/forms.py

  • Committer: franku
  • Date: 2018-10-04 15:26:48 UTC
  • mfrom: (499.1.6 ip_address_field)
  • Revision ID: somal@arcor.de-20181004152648-71oq1enpb84tkxrb
Remove the use of an IPAddressField from wiki, wlimages and pybb

Show diffs side-by-side

added added

removed removed

Lines of Context:
wiki/forms.py
22
22
    summary = forms.CharField(widget=forms.Textarea)
23
23
 
24
24
    comment = forms.CharField(required=False)
25
 
    user_ip = forms.CharField(widget=forms.HiddenInput)
26
25
 
27
26
    content_type = forms.ModelChoiceField(
28
27
        queryset=ContentType.objects.all(),
35
34
 
36
35
    class Meta:
37
36
        model = Article
38
 
        exclude = ('creator', 'creator_ip',
39
 
                   'group', 'created_at', 'last_update')
 
37
        exclude = ('creator', 'group', 'created_at', 'last_update')
40
38
 
41
39
    def clean_title(self):
42
40
        """Check for some errors regarding the title:
92
90
 
93
91
    def save(self, *args, **kwargs):
94
92
        # 0 - Extra data
95
 
        editor_ip = self.cleaned_data['user_ip']
96
93
        comment = self.cleaned_data['comment']
97
94
 
98
95
        # 2 - Save the Article
102
99
        editor = getattr(self, 'editor', None)
103
100
        group = getattr(self, 'group', None)
104
101
        if self.is_new:
105
 
            article.creator_ip = editor_ip
106
102
            if editor is not None:
107
103
                article.creator = editor
108
104
                article.group = group
113
109
        # 4 - Create new revision
114
110
        changeset = article.new_revision(
115
111
            self.old_content, self.old_title, self.old_markup,
116
 
            comment, editor_ip, editor)
 
112
            comment, editor)
117
113
 
118
114
        return article, changeset