From ba005680355192ae9348812c516c6d78cfe051b4 Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Tue, 11 Apr 2017 16:13:24 +0200
Subject: [PATCH] dev #56034 continue renaming process

---
 .../admin/views/scripts/activity/_session_list.phtml |  4 ++--
 .../admin/views/scripts/activity/activity_form.phtml | 12 ++++++------
 .../js/custom-fields/tests/custom_fields_test.js     |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/modules/admin/views/scripts/activity/_session_list.phtml b/application/modules/admin/views/scripts/activity/_session_list.phtml
index 45300bb7a3e..37292230080 100644
--- a/application/modules/admin/views/scripts/activity/_session_list.phtml
+++ b/application/modules/admin/views/scripts/activity/_session_list.phtml
@@ -1,10 +1,10 @@
 <li class="<?php echo $this->item_class; echo $this->session->isAnnule() ? ' annule': '' ?>">
 <div>&nbsp</div>
 <?php
-echo $this->partial('formation/_session_subscribers.phtml',
+echo $this->partial('activity/_session_subscribers.phtml',
                     ['session' => $this->session]);
 
-echo $this->partial('formation/_session_actions.phtml',
+echo $this->partial('activity/_session_actions.phtml',
                     ['session' => $this->session]);
 
 ?>
diff --git a/application/modules/admin/views/scripts/activity/activity_form.phtml b/application/modules/admin/views/scripts/activity/activity_form.phtml
index df7b485b014..19692484649 100644
--- a/application/modules/admin/views/scripts/activity/activity_form.phtml
+++ b/application/modules/admin/views/scripts/activity/activity_form.phtml
@@ -1,8 +1,8 @@
 <?php
-echo $this->partial('formation/_formation_panel.phtml',
-                    array('formation' => $this->formation));
-echo $this->customFieldsValuesUrl($this->session_formation 
-                                 ? $this->session_formation 
-                                 : $this->formation);
-echo $this->renderForm($this->form); 
+echo $this->partial('activity/_activity_panel.phtml',
+                    array('activity' => $this->activity));
+echo $this->customFieldsValuesUrl($this->session_activity
+                                 ? $this->session_activity
+                                 : $this->activity);
+echo $this->renderForm($this->form);
 ?>
diff --git a/public/admin/js/custom-fields/tests/custom_fields_test.js b/public/admin/js/custom-fields/tests/custom_fields_test.js
index 79ab39730fe..51776c94032 100644
--- a/public/admin/js/custom-fields/tests/custom_fields_test.js
+++ b/public/admin/js/custom-fields/tests/custom_fields_test.js
@@ -67,6 +67,6 @@ test('url for field values should be as expected' ,function() {
 
 
 test('url for number of children by model and id should be  as expected' ,function() {
-  var values = helper.numberOf('Formation',98,'Session');
-  equal(options.url, baseUrl+'/opac/datas/numberof/model/Formation/id/98/children/Session', options.url);
+  var values = helper.numberOf('Activity',98,'Session');
+  equal(options.url, baseUrl+'/opac/datas/numberof/model/Activity/id/98/children/Session', options.url);
 });
-- 
GitLab