Revision c4b738dc flowspec/models.py

b/flowspec/models.py
176 176
    comments = models.TextField(null=True, blank=True, verbose_name=_("Comments"))
177 177
    requesters_address = models.CharField(max_length=255, blank=True, null=True)
178 178

  
179
<<<<<<< HEAD
180
=======
181 179

  
182
>>>>>>> 7ae0e0ec4604a3363386ec307eaad6002ed8bd8d
183 180
    def __unicode__(self):
184 181
        return self.name
185 182

  
......
194 191
            self.name = "%s_%s" %(self.name, hash)
195 192
        super(Route, self).save(*args, **kwargs) # Call the "real" save() method.
196 193

  
197
<<<<<<< HEAD
198
=======
199 194

  
200
>>>>>>> 7ae0e0ec4604a3363386ec307eaad6002ed8bd8d
201 195
    def clean(self, *args, **kwargs):
202 196
        from django.core.exceptions import ValidationError
203 197
        if self.destination:
......
217 211
        peer = self.applier.get_profile().peer.peer_tag
218 212
        send_message("[%s] Adding rule %s. Please wait..." % (self.applier.username, self.name), peer)
219 213
        response = add.delay(self)
220
<<<<<<< HEAD
221 214
        logger.info('Got add job id: %s' % response)
222 215
        fqdn = Site.objects.get_current().domain
223 216
        admin_url = 'https://%s%s' % (
......
246 239
            'user': self.applier.username
247 240
        }
248 241
        logger.info(mail_body, extra=d)
249
=======
250
        logger.info("Got add job id: %s" %response)
251
>>>>>>> 7ae0e0ec4604a3363386ec307eaad6002ed8bd8d
252 242

  
253 243
    def commit_edit(self, *args, **kwargs):
254 244
        peer = self.applier.get_profile().peer.peer_tag

Also available in: Unified diff