diff --git a/Gemfile.lock b/Gemfile.lock index b3e3846..2ca0139 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,14 +18,14 @@ GIT GIT remote: https://github.com/work-design/rails_design.git - revision: 8347a39a95ad59f0c87446b5360db06d1da4b339 + revision: 92878d618942ec4127535949fc5f4b84cc8c8d83 specs: rails_design (0.0.1) rails GIT remote: https://github.com/work-design/rails_extend.git - revision: ced020805eda08fd8ab8c93c408fe2ce5439bd1f + revision: 06f605135a1f7eb8a4c94d36400c759ed60c76d9 specs: rails_extend (1.0.1) rails (>= 5.0) diff --git a/app/views/auditor/panel/audits/_index_tbody.html.erb b/app/views/auditor/panel/audits/_index_tbody.html.erb index d8e2f43..02ade2d 100644 --- a/app/views/auditor/panel/audits/_index_tbody.html.erb +++ b/app/views/auditor/panel/audits/_index_tbody.html.erb @@ -6,18 +6,19 @@

<%= model.remote_ip %>

<%= model.note %> - - <% model.audited_changes_i18n.each do |key, value| %> -
-
- <%= key %>: -
- <%= value %> - -
-
-
- <% end %> + +<% model.audited_changes_i18n.each do |key, value| %> +
+ <%= key %>: + <% if value.is_a?(Array) %> + <%= value[0] %> + + <%= value[1] %> + <% else %> + <%= value %> + <% end %> +
+<% end %> <% model.related_changes.each do |key, value| %> diff --git a/app/views/panel/_audit_nav.html.erb b/app/views/panel/_audit_nav.html.erb new file mode 100644 index 0000000..93ab561 --- /dev/null +++ b/app/views/panel/_audit_nav.html.erb @@ -0,0 +1,10 @@ +
+ + + <%= t('auditor.panel.title') %> + + + +
diff --git a/config/locales/en.controller.yml b/config/locales/en.controller.yml new file mode 100644 index 0000000..7e264c3 --- /dev/null +++ b/config/locales/en.controller.yml @@ -0,0 +1,18 @@ +en: + auditor: + title: 操作审计 + admin: + approvals: + index: + title: 待审核 + audits: + index: + title: 操作日志 + verifications: + new: + title: 审核 + panel: + title: Audits + audits: + index: + title: Audits Log diff --git a/config/locales/en.yml b/config/locales/en.yml index df41bf0..366441f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,8 +1,4 @@ en: - audit/admin: - checks: - new: - check: 审核 activerecord: models: check: 审核 diff --git a/package.gemspec b/package.gemspec index 55f1e1c..dbf0b36 100644 --- a/package.gemspec +++ b/package.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = 'rails_audit' s.version = '1.0.4' - s.authors = ['qinmingyuan'] + s.authors = ['Mingyuan Qin'] s.email = ['mingyuan0715@foxmail.com'] s.homepage = 'https://github.com/work-design/rails_audit' s.summary = 'Audit changes for model with operator'