Feature #2096 » feature_2096_adriano_crestani.patch
| app/helpers/issues_helper.rb (working copy) | ||
|---|---|---|
|
|
||
|
unless no_html
|
||
|
label = content_tag('strong', label)
|
||
|
old_value = content_tag("i", h(old_value)) if detail.old_value
|
||
|
if !custom_field.nil? && custom_field.field_format == 'user_list'
|
||
|
old_value = content_tag("i", old_value) if detail.old_value
|
||
|
else
|
||
|
old_value = content_tag("i", h(old_value)) if detail.old_value
|
||
|
end
|
||
|
|
||
|
old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
|
||
|
if detail.property == 'attachment' && !value.blank? && a = Attachment.find_by_id(detail.prop_key)
|
||
|
# Link to the attachment if it has not been removed
|
||
|
value = link_to_attachment(a)
|
||
|
elsif !custom_field.nil? && custom_field.field_format == 'user_list'
|
||
|
value = content_tag("i", value) if value
|
||
|
else
|
||
|
value = content_tag("i", h(value)) if value
|
||
|
end
|
||
| app/helpers/custom_fields_helper.rb (working copy) | ||
|---|---|---|
|
(custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') :
|
||
|
'<option></option>'
|
||
|
select_tag(field_name, blank_option + options_for_select(custom_field.possible_values, custom_value.value), :id => field_id)
|
||
|
when "user_list"
|
||
|
users = @issue == nil ? User.find(:all) : @issue.assignable_users
|
||
|
users.delete_if { |user| user.anonymous? }
|
||
|
custom_field.possible_values.clear()
|
||
|
users.each { |user| custom_field.possible_values << user unless user.anonymous? }
|
||
|
blank_option = custom_field.is_required? ?
|
||
|
(custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') :
|
||
|
'<option></option>'
|
||
|
select_tag(field_name, blank_option + options_for_select(users.collect { |x| [x.name, x.login] }, custom_value.value), :id => field_id)
|
||
|
else
|
||
|
text_field_tag(field_name, custom_value.value, :id => field_id)
|
||
|
end
|
||
| ... | ... | |
|
begin; format_date(value.to_date); rescue; value end
|
||
|
when "bool"
|
||
|
l_YesNo(value == "1")
|
||
|
when "user_list"
|
||
|
link_to_user(User.find(:first, :conditions => [ "login = ?", value]))
|
||
|
else
|
||
|
value
|
||
|
end
|
||
| ... | ... | |
|
def custom_field_formats_for_select
|
||
|
CustomField::FIELD_FORMATS.sort {|a,b| a[1][:order]<=>b[1][:order]}.collect { |k| [ l(k[1][:name]), k[0] ] }
|
||
|
end
|
||
|
# Return a string used to display a custom value on the issues view
|
||
|
def format_value_for_view(value, field_format)
|
||
|
return "-" unless value && !value.empty?
|
||
|
case field_format
|
||
|
when "user_list"
|
||
|
link_to_user(User.find(:first, :conditions => [ "login = ?", value]))
|
||
|
else
|
||
|
format_value(value, field_format)
|
||
|
end
|
||
|
end
|
||
|
def show_value_on_view(custom_value)
|
||
|
return "" unless custom_value
|
||
|
format_value_for_view(custom_value.value, custom_value.custom_field.field_format)
|
||
|
end
|
||
|
end
|
||
| app/models/issue.rb (working copy) | ||
|---|---|---|
|
# Author and assignee are always notified unless they have been locked
|
||
|
recipients << author.mail if author && author.active?
|
||
|
recipients << assigned_to.mail if assigned_to && assigned_to.active?
|
||
|
custom_users = Array.new()
|
||
|
custom_values.each { |x| custom_users << User.find(:first, :conditions => [ "login = ?", x.value]) }
|
||
|
custom_users = custom_users.compact
|
||
|
custom_users.each { |x| recipients << x.mail }
|
||
|
recipients.compact.uniq
|
||
|
end
|
||
|
|
||
| app/models/custom_field.rb (working copy) | ||
|---|---|---|
|
"int" => { :name => :label_integer, :order => 3 },
|
||
|
"float" => { :name => :label_float, :order => 4 },
|
||
|
"list" => { :name => :label_list, :order => 5 },
|
||
|
"date" => { :name => :label_date, :order => 6 },
|
||
|
"bool" => { :name => :label_boolean, :order => 7 }
|
||
|
"user_list" => { :name => :label_user_list, :order => 6 },
|
||
|
"date" => { :name => :label_date, :order => 7 },
|
||
|
"bool" => { :name => :label_boolean, :order => 8 }
|
||
|
}.freeze
|
||
|
validates_presence_of :name, :field_format
|
||
| app/views/custom_fields/_form.rhtml (working copy) | ||
|---|---|---|
|
if (p_searchable) Element.show(p_searchable.parentNode);
|
||
|
Element.show(p_values);
|
||
|
break;
|
||
|
case "user_list":
|
||
|
p_default.setAttribute('type','combolist');
|
||
|
Element.hide(p_length.parentNode);
|
||
|
Element.hide(p_regexp.parentNode);
|
||
|
if (p_searchable) Element.show(p_searchable.parentNode);
|
||
|
Element.hide(p_values);
|
||
|
break;
|
||
|
case "bool":
|
||
|
p_default.setAttribute('type','checkbox');
|
||
|
Element.hide(p_length.parentNode);
|
||
| app/views/projects/show.rhtml (working copy) | ||
|---|---|---|
|
<% end %>
|
||
|
<% @project.custom_values.each do |custom_value| %>
|
||
|
<% if !custom_value.value.empty? %>
|
||
|
<li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
|
||
|
<li><%= custom_value.custom_field.name%>: <%= custom_value.custom_field.field_format == "user_list" ? show_value_on_view(custom_value) : h(show_value(custom_value)) %></li>
|
||
|
<% end %>
|
||
|
<% end %>
|
||
|
</ul>
|
||
| app/views/account/show.rhtml (working copy) | ||
|---|---|---|
|
<% end %>
|
||
|
<% for custom_value in @custom_values %>
|
||
|
<% if !custom_value.value.empty? %>
|
||
|
<li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
|
||
|
<li><%= custom_value.custom_field.name%>: <%= custom_value.custom_field.field_format == "user_list" ? show_value_on_view(custom_value) : h(show_value(custom_value)) %></li>
|
||
|
<% end %>
|
||
|
<% end %>
|
||
|
<li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
|
||
| app/views/issues/show.rhtml (working copy) | ||
|---|---|---|
|
<tr>
|
||
|
<% n = 0 -%>
|
||
|
<% @issue.custom_values.each do |value| -%>
|
||
|
<td valign="top"><b><%=h value.custom_field.name %>:</b></td><td valign="top"><%= simple_format(h(show_value(value))) %></td>
|
||
|
<td valign="top"><b><%= value.custom_field.name %> :</b></td><td valign="top"><%= value.custom_field.field_format == "user_list" ? show_value_on_view(value) :
|
||
|
simple_format(h(show_value_on_issue(value))) %></td>
|
||
|
<% n = n + 1
|
||
|
if (n > 1)
|
||
|
n = 0 %>
|
||
| lang/lt.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: Subprojektai
|
||
|
label_min_max_length: Min - Maks ilgis
|
||
|
label_list: Sąrašas
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Data
|
||
|
label_integer: Sveikasis skaičius
|
||
|
label_float: Float
|
||
| lang/ro.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: Subproiecte
|
||
|
label_min_max_length: Lungime min-max
|
||
|
label_list: Lista
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Data
|
||
|
label_integer: Numar intreg
|
||
|
label_boolean: Variabila logica
|
||
| lang/zh.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: %s 及其子项目
|
||
|
label_min_max_length: 最小 - 最大 长度
|
||
|
label_list: 列表
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: 日期
|
||
|
label_integer: 整数
|
||
|
label_float: 浮点数
|
||
| lang/vn.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: %s và dự án con
|
||
|
label_min_max_length: Min - Max length
|
||
|
label_list: List
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Ngày
|
||
|
label_integer: Integer
|
||
|
label_float: Float
|
||
| lang/pt.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: %s e sub-projectos
|
||
|
label_min_max_length: Tamanho mínimo-máximo
|
||
|
label_list: Lista
|
||
|
label_user_list: Lista de Usuário
|
||
|
label_date: Data
|
||
|
label_integer: Inteiro
|
||
|
label_float: Decimal
|
||
| lang/ca.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: %s i els seus subprojectes
|
||
|
label_min_max_length: Longitud mín - max
|
||
|
label_list: Llist
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Data
|
||
|
label_integer: Enter
|
||
|
label_float: Flotant
|
||
| lang/pt-br.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: %s e seus sub-projetos
|
||
|
label_min_max_length: Tamanho mín-máx
|
||
|
label_list: Lista
|
||
|
label_user_list: Lista de Usuário
|
||
|
label_date: Data
|
||
|
label_integer: Inteiro
|
||
|
label_float: Decimal
|
||
| lang/tr.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: Alt Projeler
|
||
|
label_min_max_length: Min - Maks uzunluk
|
||
|
label_list: Liste
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Tarih
|
||
|
label_integer: Tam sayı
|
||
|
label_float: Noktalı sayı
|
||
| lang/ru.yml (working copy) | ||
|---|---|---|
|
label_ldap_authentication: Авторизация с помощью LDAP
|
||
|
label_less_than_ago: менее, чем дней(я) назад
|
||
|
label_list: Список
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_loading: Загрузка...
|
||
|
label_logged_as: Вошел как
|
||
|
label_login: Войти
|
||
| lang/en.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: %s and its subprojects
|
||
|
label_min_max_length: Min - Max length
|
||
|
label_list: List
|
||
|
label_user_list: User List
|
||
|
label_date: Date
|
||
|
label_integer: Integer
|
||
|
label_float: Float
|
||
| lang/cs.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: Podprojekty
|
||
|
label_min_max_length: Min - Max délka
|
||
|
label_list: Seznam
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Datum
|
||
|
label_integer: Celé číslo
|
||
|
label_float: Desetiné číslo
|
||
| lang/es.yml (working copy) | ||
|---|---|---|
|
label_ldap_authentication: Autenticación LDAP
|
||
|
label_less_than_ago: hace menos de
|
||
|
label_list: Lista
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_loading: Cargando...
|
||
|
label_logged_as: Conectado como
|
||
|
label_login: Conexión
|
||
| lang/zh-tw.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: %s 與其子專案
|
||
|
label_min_max_length: 最小 - 最大 長度
|
||
|
label_list: 清單
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: 日期
|
||
|
label_integer: 整數
|
||
|
label_float: 福點數
|
||
| lang/ko.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: 서브 프로젝트
|
||
|
label_min_max_length: 최소 - 최대 길이
|
||
|
label_list: 리스트
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: 날짜
|
||
|
label_integer: 정수
|
||
|
label_float: 부동상수
|
||
| lang/it.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: Sottoprogetti
|
||
|
label_min_max_length: Lunghezza minima - massima
|
||
|
label_list: Elenco
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Data
|
||
|
label_integer: Intero
|
||
|
label_boolean: Booleano
|
||
| lang/sk.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: Podprojekty
|
||
|
label_min_max_length: Min - Max dĺžka
|
||
|
label_list: Zoznam
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Dátum
|
||
|
label_integer: Celé číslo
|
||
|
label_float: Desatinné číslo
|
||
| lang/uk.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: Підпроекти
|
||
|
label_min_max_length: Мінімальна - максимальна довжина
|
||
|
label_list: Список
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Дата
|
||
|
label_integer: Цілий
|
||
|
label_float: З плаваючою крапкою
|
||
| lang/da.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: Projektet %s og dets underprojekter
|
||
|
label_min_max_length: Min.-maks.-længde
|
||
|
label_list: Liste
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Dato
|
||
|
label_integer: Heltal
|
||
|
label_float: Kommatal
|
||
| lang/sr.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: Potprojekti
|
||
|
label_min_max_length: Min - Max veličina
|
||
|
label_list: Liste
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Datum
|
||
|
label_integer: Integer
|
||
|
label_boolean: Boolean
|
||
| lang/de.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: %s und dessen Unterprojekte
|
||
|
label_min_max_length: Länge (Min. - Max.)
|
||
|
label_list: Liste
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Datum
|
||
|
label_integer: Zahl
|
||
|
label_float: Fließkommazahl
|
||
| lang/bg.yml (working copy) | ||
|---|---|---|
|
label_auth_source_plural: Начини на оторизация
|
||
|
label_subproject_plural: Подпроекти
|
||
|
label_min_max_length: Мин. - Макс. дължина
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_list: Списък
|
||
|
label_date: Дата
|
||
|
label_integer: Целочислен
|
||
| lang/sv.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: Delprojekt
|
||
|
label_min_max_length: Min - Max längd
|
||
|
label_list: Lista
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Datum
|
||
|
label_integer: Heltal
|
||
|
label_boolean: Boolean
|
||
| lang/ja.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: サブプロジェクト
|
||
|
label_min_max_length: 最小値 - 最大値の長さ
|
||
|
label_list: リストから選択
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: 日付
|
||
|
label_integer: 整数
|
||
|
label_boolean: 真偽値
|
||
| lang/he.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: תת-פרויקטים
|
||
|
label_min_max_length: אורך מינימאלי - מקסימאלי
|
||
|
label_list: רשימה
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: תאריך
|
||
|
label_integer: מספר שלם
|
||
|
label_boolean: ערך בוליאני
|
||
| lang/fi.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: Aliprojektit
|
||
|
label_min_max_length: Min - Max pituudet
|
||
|
label_list: Lista
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Päivä
|
||
|
label_integer: Kokonaisluku
|
||
|
label_float: Liukuluku
|
||
| lang/fr.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: %s et ses sous-projets
|
||
|
label_min_max_length: Longueurs mini - maxi
|
||
|
label_list: Liste
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Date
|
||
|
label_integer: Entier
|
||
|
label_float: Nombre décimal
|
||
| lang/nl.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: Subprojecten
|
||
|
label_min_max_length: Min-max lengte
|
||
|
label_list: Lijst
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Datum
|
||
|
label_integer: Integer
|
||
|
label_boolean: Boolean
|
||
| lang/pl.yml (working copy) | ||
|---|---|---|
|
label_ldap_authentication: Autoryzacja LDAP
|
||
|
label_less_than_ago: dni mniej
|
||
|
label_list: Lista
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_loading: Ładowanie...
|
||
|
label_logged_as: Zalogowany jako
|
||
|
label_login: Login
|
||
| lang/th.yml (working copy) | ||
|---|---|---|
|
label_subproject_plural: โครงการย่อย
|
||
|
label_min_max_length: สั้น-ยาว สุดที่
|
||
|
label_list: รายการ
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: วันที่
|
||
|
label_integer: จำนวนเต็ม
|
||
|
label_float: จำนวนจริง
|
||
| lang/hu.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: %s és alprojektjei
|
||
|
label_min_max_length: Min - Max hossz
|
||
|
label_list: Lista
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Dátum
|
||
|
label_integer: Egész
|
||
|
label_float: Lebegőpontos
|
||
| lang/no.yml (working copy) | ||
|---|---|---|
|
label_and_its_subprojects: %s og dets underprosjekter
|
||
|
label_min_max_length: Min.-maks. lengde
|
||
|
label_list: Liste
|
||
|
# need to be translated
|
||
|
label_user_list: User List
|
||
|
label_date: Dato
|
||
|
label_integer: Heltall
|
||
|
label_float: Kommatall
|
||