Project

General

Profile

Actions

Defect #26445

closed

Text formatting not applied to commit messages even if enabled in settings

Added by Nils Grimm over 7 years ago. Updated over 7 years ago.

Status:
Closed
Priority:
Normal
Category:
UI
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:
Resolution:
Fixed
Affected version:

Description

Hello,

The option textile rendering of the commit messages is enabled.
The messages are shown as formatted but the commits aren't rendered in markdown or textile.

I looked through the commit r16062 of #22758:

    if options[:formatting] == false
      text = h(text)
    else
      formatting = options[:formatting] || Setting.text_formatting
      text = Redmine::WikiFormatting.to_html(formatting, text, :object => obj, :attribute => attr)
    end

For me it seem that the doubled options[:formatting] in the if and else part make no sense.
Because of the lazy evaluation the Setting.text_formatting isn't evaluated at all.

I changed the code to:

    if options[:formatting] == false
      text = h(text)
    else
      text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text, :object => obj, :attribute => attr)
    end

And now the comments are correctly rendered again.

Actions #1

Updated by Nils Grimm over 7 years ago

Or other way around would make sense.
If the system setting is set to false, the text would still be formatted.

    if options[:formatting] == false
      text = h(text)
    else
      formatting = Setting.text_formatting || options[:formatting] 
      text = Redmine::WikiFormatting.to_html(formatting, text, :object => obj, :attribute => attr)
    end

Actions #2

Updated by Toshi MARUYAMA over 7 years ago

  • Description updated (diff)
Actions #3

Updated by Toshi MARUYAMA over 7 years ago

  • Target version set to 3.4.2
Actions #4

Updated by Toshi MARUYAMA over 7 years ago

Nils Grimm wrote:

Or other way around would make sense.
If the system setting is set to false, the text would still be formatted.
[...]

I think your description is good enough because "format = true/false" is non sense.

Actions #5

Updated by Jean-Philippe Lang over 7 years ago

  • Subject changed from Textile rendering for commit messages doesn't render textile to Text formatting not applied to commit messages even if enabled in settings
  • Status changed from New to Closed
  • Assignee set to Jean-Philippe Lang
  • Resolution set to Fixed

Fix committed, thanks for pointing this out.

Actions

Also available in: Atom PDF