split a refno() method out of reftitle()
This commit is contained in:
parent
09da665d5a
commit
960e52d621
|
@ -63,22 +63,27 @@ class Document(Item, BasePublication):
|
|||
if self.doctype is None: return _('Unknown')
|
||||
return typenames.MAPPING.get(self.doctype, self.doctype)
|
||||
|
||||
@property
|
||||
def refno(self):
|
||||
if not self.no:
|
||||
return '(%s)' % self.session
|
||||
if self.nodoc:
|
||||
if self.noannexe:
|
||||
return u'%s (%s) - N° %s (Annexe %s)' % (
|
||||
self.no, self.session, self.nodoc, self.noannexe)
|
||||
else:
|
||||
return u'%s (%s) - N° %s' % (self.no, self.session, self.nodoc)
|
||||
else:
|
||||
if self.noannexe:
|
||||
return '%s (%s) (Annexe %s)' % (self.no, self.session, self.noannexe)
|
||||
else:
|
||||
return '%s (%s)' % (self.no, self.session)
|
||||
|
||||
@property
|
||||
def reftitle(self):
|
||||
if not self.no:
|
||||
return '%s (%s)' % (self.doctype_str, self.session)
|
||||
if self.nodoc:
|
||||
if self.noannexe:
|
||||
return u'%s - %s (%s) - N° %s (Annexe %s)' % (
|
||||
self.doctype_str, self.no, self.session, self.nodoc, self.noannexe)
|
||||
else:
|
||||
return u'%s - %s (%s) - N° %s' % (self.doctype_str, self.no, self.session, self.nodoc)
|
||||
else:
|
||||
if self.noannexe:
|
||||
return '%s - %s (%s) (Annexe %s)' % (
|
||||
self.doctype_str, self.no, self.session, self.noannexe)
|
||||
else:
|
||||
return '%s - %s (%s)' % (self.doctype_str, self.no, self.session)
|
||||
return u'%s - %s' % (self.doctype_str, self.refno)
|
||||
|
||||
@property
|
||||
def associated_docs(self):
|
||||
|
|
|
@ -194,6 +194,13 @@ class Dossier(Item, BasePublication):
|
|||
'S_SYS_ACTIVE': u'Autre',
|
||||
'S_SCE': u'En séance'}.get(self.state, u'Autre')
|
||||
|
||||
@property
|
||||
def refno(self):
|
||||
if self.no:
|
||||
return '%s (%s)' % (self.no, self.session)
|
||||
else:
|
||||
return '(%s)' % self.session
|
||||
|
||||
@property
|
||||
def reftitle(self):
|
||||
if self.no:
|
||||
|
|
|
@ -123,6 +123,13 @@ class Question(Item, BasePublication):
|
|||
'S_SYS_ACTIVE': u'Autre',
|
||||
'S_SCE': u'En séance'}.get(self.state, u'Autre')
|
||||
|
||||
@property
|
||||
def refno(self):
|
||||
if self.no:
|
||||
return '%s (%s)' % (self.no, self.session)
|
||||
else:
|
||||
return '(%s)' % self.session
|
||||
|
||||
@property
|
||||
def reftitle(self):
|
||||
if self.no:
|
||||
|
|
Reference in New Issue