diff --git a/app/views/admins/site_pages/shared/_info_list.html.erb b/app/views/admins/site_pages/shared/_info_list.html.erb index 4eaef2ef1..34b2f9325 100644 --- a/app/views/admins/site_pages/shared/_info_list.html.erb +++ b/app/views/admins/site_pages/shared/_info_list.html.erb @@ -33,7 +33,7 @@ <%= overflow_hidden_span site_page.project.name, width: 100 %> <% end %> - <%= display_text(site_page.state == true ? "已正常" : "关闭") %> + <%= display_text(site_page.state == true ? "正常" : "已关闭") %> <%= display_text(site_page.site_name) %> <%= display_text(site_page.identifier) %> <%= link_to "#{site_page.url}", site_page.url, target: '_blank'%> diff --git a/app/views/site_pages/_info.json.jbuilder b/app/views/site_pages/_info.json.jbuilder index 90840b68f..8239fbf51 100644 --- a/app/views/site_pages/_info.json.jbuilder +++ b/app/views/site_pages/_info.json.jbuilder @@ -6,6 +6,7 @@ json.user_id page.user_id json.project_id page.project_id json.site_name page.site_name json.theme page.theme +json.state page.state json.language_frame page.language_frame json.url page.url json.created_at page.created_at.strftime("%Y-%m-%d %H:%M:%S") diff --git a/app/views/site_pages/show.jbuilder b/app/views/site_pages/show.jbuilder deleted file mode 100644 index 0ca595ca1..000000000 --- a/app/views/site_pages/show.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.partial! 'info', locals: {page: @page} \ No newline at end of file diff --git a/app/views/site_pages/show.json.jbuilder b/app/views/site_pages/show.json.jbuilder new file mode 100644 index 000000000..3b89bc90f --- /dev/null +++ b/app/views/site_pages/show.json.jbuilder @@ -0,0 +1,6 @@ +json.status 0 +json.message "success" +json.data { + json.partial! 'info', locals: {page: @page} +} +