#1534 Comment column formating
This commit is contained in:
parent
01a6fd02a0
commit
bcc153582a
@ -238,6 +238,8 @@ module DmsfQueriesHelper
|
|||||||
else
|
else
|
||||||
super column, item, value
|
super column, item, value
|
||||||
end
|
end
|
||||||
|
when :comment
|
||||||
|
value.present? ? content_tag('div', textilizable(value), class: 'wiki') : ''
|
||||||
else
|
else
|
||||||
super column, item, value
|
super column, item, value
|
||||||
end
|
end
|
||||||
|
|||||||
@ -23,8 +23,10 @@ require File.expand_path('../../test_helper', __FILE__)
|
|||||||
# Queries helper
|
# Queries helper
|
||||||
class DmsfQueriesHelperTest < RedmineDmsf::Test::HelperTest
|
class DmsfQueriesHelperTest < RedmineDmsf::Test::HelperTest
|
||||||
include DmsfQueriesHelper
|
include DmsfQueriesHelper
|
||||||
|
include ActionView::Helpers::NumberHelper
|
||||||
|
include ActionView::Helpers::TagHelper
|
||||||
|
|
||||||
fixtures :dmsf_folders
|
fixtures :dmsf_folders, :dmsf_files, :dmsf_file_revisions
|
||||||
|
|
||||||
def setup
|
def setup
|
||||||
@folder1 = DmsfFolder.find 1
|
@folder1 = DmsfFolder.find 1
|
||||||
@ -32,15 +34,21 @@ class DmsfQueriesHelperTest < RedmineDmsf::Test::HelperTest
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_csv_value
|
def test_csv_value
|
||||||
c_size = QueryColumn.new(:size)
|
# Size
|
||||||
c_author = QueryColumn.new(:author)
|
column = QueryColumn.new(:size)
|
||||||
assert_equal '1 KB', csv_value(c_size, nil, 1024)
|
assert_equal '1 KB', csv_value(column, nil, 1024)
|
||||||
assert_equal 'John Smith', csv_value(c_author, @jsmith, @jsmith.id)
|
# Author
|
||||||
|
column = QueryColumn.new(:author)
|
||||||
|
assert_equal 'John Smith', csv_value(column, @jsmith, @jsmith.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_column_value
|
def test_column_value
|
||||||
c_size = QueryColumn.new(:size)
|
# Size
|
||||||
assert_equal '1 KB', csv_value(c_size, @folder1, 1024)
|
column = QueryColumn.new(:size)
|
||||||
|
assert_equal '1 KB', column_value(column, @folder1, 1024)
|
||||||
|
# Comment
|
||||||
|
column = QueryColumn.new(:comment)
|
||||||
|
assert column_value(column, @folder1, '*Comment*').include?('wiki')
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_previewable
|
def test_previewable
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user