fix

Hexlet · Jul 3, 2023 · 1aa1fc3 · 1aa1fc3
1 parent 594e721
commit 1aa1fc3
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/app/views/web/admin/career_steps/_careers.html.slim b/app/views/web/admin/career_steps/_careers.html.slim
@@ -1,4 +1,5 @@
-h4 = t('.attached')
+.h4
+  = t('.attached')
 
 - if careers.any?
   table.table id='attached'

diff --git a/app/views/web/admin/career_steps/_menu.html.slim b/app/views/web/admin/career_steps/_menu.html.slim
@@ -1,5 +1,5 @@
 ul.nav.nav-tabs.mb-4
   = menu_item t('.list'), admin_career_steps_path
   = menu_item t('.new'), new_admin_career_step_path
-  - if step
-    = menu_item step.name, edit_admin_career_step_path(step)
+  - if @step&.persisted?
+    = menu_item @step.name, edit_admin_career_step_path(@step)
diff --git a/app/views/web/admin/career_steps/edit.html.slim b/app/views/web/admin/career_steps/edit.html.slim
@@ -1,7 +1,7 @@
 - content_for :header do
-  = @step.name
+  = t('.step', name: @step.name)
 
-= render 'menu', step: @step
+= render 'menu'
 
 - if @careers.any?
   .mb-2

diff --git a/app/views/web/admin/career_steps/index.html.slim b/app/views/web/admin/career_steps/index.html.slim
@@ -1,7 +1,7 @@
 - content_for :header do
   = t('career_steps')
 
-= render 'menu', step: nil
+= render 'menu'
 
 table.table
   thead

diff --git a/app/views/web/admin/career_steps/new.html.slim b/app/views/web/admin/career_steps/new.html.slim
@@ -1,6 +1,6 @@
 - content_for :header do
   = t('.new_step')
 
-= render 'menu', step: nil
+= render 'menu'
 
 = render 'form', step: @step, url: admin_career_steps_path
diff --git a/app/views/web/admin/career_steps/show.html.slim b/app/views/web/admin/career_steps/show.html.slim
@@ -6,11 +6,13 @@
 .row.my-1
   .col-lg-12
     .my-1
-      h3 = @step.name
+      .h3
+        = @step.name
       .bg-light.rounded.py-2.px-3
         == markdown2html(@step.description)
     .my-1
-      h4 = t('.tasks')
+      .h4
+        = t('.tasks')
       .bg-light.rounded.py-2.px-3
         == markdown2html(@step.tasks_text)
 

diff --git a/app/views/web/admin/careers/_steps.html.slim b/app/views/web/admin/careers/_steps.html.slim
@@ -1,7 +1,5 @@
 h3.my-4.me-3 = t('.steps_career')
 
-/ = link_to t('.add_new_step'), new_admin_career_step_path(career), class: 'btn btn-primary'
-
 table.table
   thead
     tr

diff --git a/config/locales/admin/en.yml b/config/locales/admin/en.yml
@@ -26,6 +26,8 @@ en:
         index:
           admins: Administrators
       career_steps:
+        edit:
+          step: 'Step: %{name}'
         index:
           edit: Edit
           show: Show

diff --git a/config/locales/admin/ru.yml b/config/locales/admin/ru.yml
@@ -27,6 +27,7 @@ ru:
           admins: Администраторы
       career_steps:
         edit:
+          step: 'Шаг: %{name}'
           attached_careers: 'Связанные карьерные треки:'
         form:
           cancel: Отменить