Skip to content

Commit 8e84581

Browse files
authored
Merge pull request #21 from gtt-project/feature/combo_label_value
Support combo item label/value expression
2 parents 6b83030 + 9387810 commit 8e84581

File tree

1 file changed

+23
-8
lines changed

1 file changed

+23
-8
lines changed

app/controllers/smash_tags_controller.rb

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,24 @@ def build_tags
7878
default_priority = nil
7979
IssuePriority.active.each do |priority|
8080
priorities.append({
81-
item: priority.name
81+
item: {
82+
label: priority.name,
83+
value: priority.id.to_s
84+
}
8285
})
8386
if priority.is_default
84-
default_priority = priority.name
87+
default_priority = priority.id.to_s
8588
end
8689
end
8790
# Issue categories
8891
categories = []
8992
if @project.present?
9093
@project.issue_categories.each do |category|
9194
categories.append({
92-
item: category.name
95+
item: {
96+
label: category.name,
97+
value: category.id.to_s
98+
}
9399
})
94100
end
95101
end
@@ -99,11 +105,14 @@ def build_tags
99105
if @project.present?
100106
@project.versions.each do |version|
101107
versions.append({
102-
item: version.name
108+
item: {
109+
label: version.name,
110+
value: version.id.to_s
111+
}
103112
})
104113
end
105114
if @project.default_version.present?
106-
default_version = @project.default_version.name
115+
default_version = @project.default_version.id
107116
end
108117
end
109118
# Trackers
@@ -115,7 +124,10 @@ def build_tags
115124
if @project.blank? and project_ids.present?
116125
Project.where(id: project_ids).sort.each {|project|
117126
projects.append({
118-
item: project.name
127+
item: {
128+
label: project.name,
129+
value: project.id.to_s
130+
}
119131
})
120132
}
121133
end
@@ -230,7 +242,10 @@ def build_tags
230242
done_ratios = []
231243
0.step(100, 10) {|ratio|
232244
done_ratios.append({
233-
item: "#{ratio} %"
245+
item: {
246+
label: "#{ratio} %",
247+
value: ratio.to_s
248+
}
234249
})
235250
}
236251
formitems.append({
@@ -239,7 +254,7 @@ def build_tags
239254
values: {
240255
items: done_ratios
241256
},
242-
value: "0 %",
257+
value: "0",
243258
type: "stringcombo"
244259
})
245260
end

0 commit comments

Comments
 (0)