Skip to content

Commit 0f98183

Browse files
X1tingiNecas
authored andcommitted
fix returns displaying
1 parent b0f32e2 commit 0f98183

File tree

4 files changed

+23
-2
lines changed

4 files changed

+23
-2
lines changed

app/views/apipie/apipies/_method_detail.erb

+17
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,22 @@
3636
</tbody>
3737
</table>
3838
<% end %>
39+
<% unless method[:returns].blank? %>
40+
<%= heading(t('apipie.returns'), h_level) %>
41+
<% method[:returns].each do |item| %>
42+
<%= heading("#{t('apipie.code')}: #{item[:code]}", h_level + 1) %>
43+
<table class='table'>
44+
<thead>
45+
<tr>
46+
<th><%= t('apipie.param_name') %></th>
47+
<th><%= t('apipie.description') %></th>
48+
</tr>
49+
</thead>
50+
<tbody>
51+
<%= render(:partial => "params", :locals => {:params => item[:returns_object]}) %>
52+
</tbody>
53+
</table>
54+
<% end %>
55+
<% end %>
3956

4057
<%= render(:partial => "headers", :locals => {:headers => method[:headers], :h_level => h_level }) %>

app/views/apipie/apipies/_params.html.erb

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
<%- if param[:validator].present? %>
2222
<li><%= Apipie.markup_to_html(param[:validator]).html_safe %></li>
2323
<%- end %>
24-
<%- param[:validations].each do |item| %>
25-
<li><%= item.html_safe %></li>
24+
<%- if param[:validations].present? %>
25+
<%- param[:validations].each do |item| %>
26+
<li><%= item.html_safe %></li>
27+
<%- end %>
2628
<%- end %>
2729
</ul>
2830
<%- end %>

config/locales/en.yml

+1
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ en:
2929
api_documentation: API documentation
3030
headers: Headers
3131
header_name: Header name
32+
code: Code

lib/apipie/method_description.rb

+1
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ def to_json(lang=nil)
186186
:full_description => Apipie.app.translate(@full_description, lang),
187187
:errors => errors.map(&:to_json),
188188
:params => params_ordered.map{ |param| param.to_json(lang) }.flatten,
189+
:returns => @returns.map{ |return_item| return_item.to_json(lang) }.flatten,
189190
:examples => @examples,
190191
:metadata => @metadata,
191192
:see => see.map(&:to_json),

0 commit comments

Comments
 (0)