Changeset 7859
- Timestamp:
- Feb 11, 2009, 11:11:48 PM (15 years ago)
- Location:
- branches/0.11-stable
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.11-stable
-
branches/0.11-stable/trac/htdocs/css/ticket.css
r6148 r7859 57 57 } 58 58 #ticket table.properties td { width: 30% } 59 #ticket table.properties td p:first-child { margin-top: 0 } 60 #ticket table.properties td p:last-child { margin-bottom: 0 } 59 61 #ticket table.properties .description { border-top: 1px solid #dd9 } 60 62 -
branches/0.11-stable/trac/ticket/api.py
r7770 r7859 309 309 field['optional'] = True 310 310 field['options'].remove('') 311 elif field['type'] == 'text': 312 field['format'] = config.get(name + '.format', 'plain') 311 313 elif field['type'] == 'textarea': 314 field['format'] = config.get(name + '.format', 'plain') 312 315 field['width'] = config.getint(name + '.cols') 313 316 field['height'] = config.getint(name + '.rows') -
branches/0.11-stable/trac/ticket/query.py
r7847 r7859 575 575 cols = self.get_columns() 576 576 labels = dict([(f['name'], f['label']) for f in self.fields]) 577 wikify = set(f['name'] for f in self.fields 578 if f['type'] == 'text' and f.get('format') == 'wiki') 577 579 578 580 # TODO: remove after adding time/changetime to the api.py … … 582 584 headers = [{ 583 585 'name': col, 'label': labels.get(col, _('Ticket')), 586 'wikify': col in wikify, 584 587 'href': self.get_href(context.href, order=col, 585 588 desc=(col == self.order and not self.desc)) -
branches/0.11-stable/trac/ticket/templates/query_results.html
r7808 r7859 68 68 <py:when test="name == 'owner' and value">${authorinfo(value)}</py:when> 69 69 <py:when test="name == 'milestone'"><a title="View milestone" href="${href.milestone(value)}">${value}</a></py:when> 70 <py:when test="header.wikify">${wiki_to_oneliner(ticket_context, value)}</py:when> 70 71 <py:otherwise>$value</py:otherwise> 71 72 </td> -
branches/0.11-stable/trac/ticket/templates/ticket.html
r7819 r7859 329 329 <textarea py:when="'textarea'" id="field-${field.name}" name="field_${field.name}" 330 330 cols="${field.width}" rows="${field.height}" 331 class="${field.format == 'wiki' and 'wikitext' or None}" 331 332 py:content="value"></textarea> 332 333 <span py:when="'checkbox'"> -
branches/0.11-stable/trac/ticket/tests/api.py
r6582 r7859 25 25 self.env.config.set('ticket-custom', 'test.label', 'Test') 26 26 self.env.config.set('ticket-custom', 'test.value', 'Foo bar') 27 self.env.config.set('ticket-custom', 'test.format', 'wiki') 27 28 fields = TicketSystem(self.env).get_custom_fields() 28 29 self.assertEqual({'name': 'test', 'type': 'text', 'label': 'Test', 29 'value': 'Foo bar', 'order': 0 },30 'value': 'Foo bar', 'order': 0, 'format': 'wiki'}, 30 31 fields[0]) 31 32 … … 58 59 self.env.config.set('ticket-custom', 'test.cols', '60') 59 60 self.env.config.set('ticket-custom', 'test.rows', '4') 61 self.env.config.set('ticket-custom', 'test.format', 'wiki') 60 62 fields = TicketSystem(self.env).get_custom_fields() 61 63 self.assertEqual({'name': 'test', 'type': 'textarea', 'label': 'Test', 62 64 'value': 'Foo bar', 'width': 60, 'height': 4, 63 'order': 0 },65 'order': 0, 'format': 'wiki'}, 64 66 fields[0]) 65 67 -
branches/0.11-stable/trac/ticket/web_ui.py
r7835 r7859 50 50 add_warning, add_ctxtnav, prevnext_nav, Chrome, \ 51 51 INavigationContributor, ITemplateProvider 52 from trac.wiki.formatter import format_to 52 from trac.wiki.formatter import format_to, format_to_html, format_to_oneliner 53 53 54 54 class InvalidTicket(TracError): … … 1141 1141 if value in ('1', '0'): 1142 1142 field['rendered'] = value == '1' and _('yes') or _('no') 1143 1143 elif type_ == 'text': 1144 if field.get('format') == 'wiki': 1145 field['rendered'] = format_to_oneliner(self.env, context, 1146 ticket[name]) 1147 elif type_ == 'textarea': 1148 if field.get('format') == 'wiki': 1149 field['rendered'] = \ 1150 format_to_html(self.env, context, ticket[name], 1151 escape_newlines=self.must_preserve_newlines) 1152 1144 1153 # ensure sane defaults 1145 1154 field.setdefault('optional', False)
Note:
See TracChangeset
for help on using the changeset viewer.