Revision 36d49217 cloudcmsfaq/models.py

b/cloudcmsfaq/models.py
66 66

  
67 67
    ordering = models.SmallIntegerField(_('ordering'), default=0)
68 68
    display_on_menu = models.BooleanField(default=False)
69
    image = MediaFileForeignKey(MediaFile, blank=True, null=True)
70
    class_name = models.CharField(_('class_name'), max_length=200, blank=True, null=True)
69 71

  
70 72
    class Meta:
71 73
        verbose_name = _('category')
72 74
        verbose_name_plural = _('categories')
73
        ordering = ['-ordering',]
75
        ordering = ['ordering',]
74 76

  
75 77
    objects = translations.TranslatedObjectManager()
76

  
78
 
79
        
77 80
    def __unicode__(self):
78 81
        trans = translations.TranslatedObjectMixin.__unicode__(self)
79 82
        return trans or _('Unnamed category')
......
133 136
            related_name="faqs",
134 137
            verbose_name=_('application'))
135 138

  
136
    published_on = models.DateTimeField(_('published on'), blank=True, null=True, default=datetime.now,
139
    published_on = models.DateTimeField(_('published on'), blank=True, null=False, default=datetime.now,
137 140
        help_text=_('Will be filled in automatically when question gets published.'))
138 141
    last_changed = models.DateTimeField(_('last change'), auto_now=True, editable=False)
139 142

  
......
145 148

  
146 149
    objects = QuestionManager()
147 150

  
151

  
148 152
    class Meta:
149 153
        get_latest_by = 'published_on'
150
        ordering = ['service', 'category', '-published_on']
154
        ordering = ['service', 'category__ordering', 'published_on']
151 155
        verbose_name = _('faq')
152 156
        verbose_name_plural = _('faqs')
153 157

  
154 158
    def __unicode__(self):
155 159
        return self.title
156 160

  
161
    def get_next(self):
162
        return self.get_next_by_published_on(category=self.category, service=self.service)
163

  
164
    def get_previous(self):
165
        return self.get_previous_by_published_on(category=self.category, service=self.service)
166
    
157 167
    def get_absolute_url(self):
158 168
        try:
159 169
            r = reverse('cloudcmsfaq_question_detail', 'cloudcmsfaq.urls', (),

Also available in: Unified diff