More renaming.

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 9a6dc35b691a61f9212a3753003b66cddd007f33..3a5e50e18a481f4d882798f843c5f9697a8cf0e4 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -701,7 +701,7 @@ class ttTeamHelper {
       $record_type_v = '';
     }
 
       $record_type_v = '';
     }
 

-    $uncompleted_indicators = $fields['uncompleted_entries'];
+    $uncompleted_indicators = $fields['uncompleted_indicators'];

     if ($uncompleted_indicators !== null) {
       $uncompleted_indicators_f = ', uncompleted_indicators';
       $uncompleted_indicators_v = ', ' . (int)$uncompleted_indicators;
     if ($uncompleted_indicators !== null) {
       $uncompleted_indicators_f = ', uncompleted_indicators';
       $uncompleted_indicators_v = ', ' . (int)$uncompleted_indicators;


@@ -765,7 +765,7 @@ class ttTeamHelper {
     if (isset($fields['week_start'])) $week_start_part = ', week_start = '.intval($fields['week_start']);
     if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.intval($fields['tracking_mode']);
     if (isset($fields['record_type'])) $record_type_part = ', record_type = '.intval($fields['record_type']);
     if (isset($fields['week_start'])) $week_start_part = ', week_start = '.intval($fields['week_start']);
     if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.intval($fields['tracking_mode']);
     if (isset($fields['record_type'])) $record_type_part = ', record_type = '.intval($fields['record_type']);

-    if (isset($fields['uncompleted_entries'])) $uncompleted_indicators_part = ', uncompleted_indicators = '.intval($fields['uncompleted_entries']);
+    if (isset($fields['uncompleted_indicators'])) $uncompleted_indicators_part = ', uncompleted_indicators = '.intval($fields['uncompleted_indicators']);

     if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
     if (isset($fields['workday_hours'])) $workday_hours_part = ', workday_hours = '.$mdb2->quote($fields['workday_hours']);
     if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
     if (isset($fields['workday_hours'])) $workday_hours_part = ', workday_hours = '.$mdb2->quote($fields['workday_hours']);

diff --git a/WEB-INF/templates/profile_edit.tpl b/WEB-INF/templates/profile_edit.tpl
index 7f8cd2811913f9db4782890aaf5a9b2211e1c269..6a72508a4deceacbcc049466b762bdd0d29920a7 100644 (file)
--- a/WEB-INF/templates/profile_edit.tpl
+++ b/WEB-INF/templates/profile_edit.tpl
@@ -141,7 +141,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.profile.uncompleted_indicators}:</td>
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.profile.uncompleted_indicators}:</td>

-            <td>{$forms.profileForm.uncompleted_entries.control}</td>
+            <td>{$forms.profileForm.uncompleted_indicators.control}</td>

           </tr>
 
           {* initialize preview text *}
           </tr>
 
           {* initialize preview text *}

diff --git a/profile_edit.php b/profile_edit.php
index bc056a648943d4777a72944ab06dcb127ae2e758..3bf547acba0b292b5b6a58442b7201587cd545a4 100644 (file)
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -60,7 +60,7 @@ if ($request->isPost()) {
     $cl_start_week = $request->getParameter('start_week');
     $cl_tracking_mode = $request->getParameter('tracking_mode');
     $cl_record_type = $request->getParameter('record_type');
     $cl_start_week = $request->getParameter('start_week');
     $cl_tracking_mode = $request->getParameter('tracking_mode');
     $cl_record_type = $request->getParameter('record_type');

-    $cl_uncompleted_entries = $request->getParameter('uncompleted_entries');
+    $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');

     $cl_charts = $request->getParameter('charts');
     $cl_clients = $request->getParameter('clients');
     $cl_client_required = $request->getParameter('client_required');
     $cl_charts = $request->getParameter('charts');
     $cl_clients = $request->getParameter('clients');
     $cl_client_required = $request->getParameter('client_required');


@@ -87,7 +87,7 @@ if ($request->isPost()) {
     $cl_start_week = $user->week_start;
     $cl_tracking_mode = $user->tracking_mode;
     $cl_record_type = $user->record_type;
     $cl_start_week = $user->week_start;
     $cl_tracking_mode = $user->tracking_mode;
     $cl_record_type = $user->record_type;

-    $cl_uncompleted_entries = $user->uncompleted_indicators;
+    $cl_uncompleted_indicators = $user->uncompleted_indicators;

 
     // Which plugins do we have enabled?
     $plugins = explode(',', $user->plugins);
 
     // Which plugins do we have enabled?
     $plugins = explode(',', $user->plugins);


@@ -174,7 +174,7 @@ if ($user->canManageTeam()) {
   $uncompleted_indicators_options = array();
   $uncompleted_indicators_options[UNCOMPLETED_INDICATORS_NONE] = $i18n->getKey('form.profile.uncompleted_indicators_none');
   $uncompleted_indicators_options[UNCOMPLETED_INDICATORS] = $i18n->getKey('form.profile.uncompleted_indicators_show');
   $uncompleted_indicators_options = array();
   $uncompleted_indicators_options[UNCOMPLETED_INDICATORS_NONE] = $i18n->getKey('form.profile.uncompleted_indicators_none');
   $uncompleted_indicators_options[UNCOMPLETED_INDICATORS] = $i18n->getKey('form.profile.uncompleted_indicators_show');

-  $form->addInput(array('type'=>'combobox','name'=>'uncompleted_entries','style'=>'width: 150px;','data'=>$uncompleted_indicators_options,'value'=>$cl_uncompleted_entries));
+  $form->addInput(array('type'=>'combobox','name'=>'uncompleted_indicators','style'=>'width: 150px;','data'=>$uncompleted_indicators_options,'value'=>$cl_uncompleted_indicators));

 
   $form->addInput(array('type'=>'checkbox','name'=>'charts','data'=>1,'value'=>$cl_charts));
   $form->addInput(array('type'=>'checkbox','name'=>'clients','data'=>1,'value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));
 
   $form->addInput(array('type'=>'checkbox','name'=>'charts','data'=>1,'value'=>$cl_charts));
   $form->addInput(array('type'=>'checkbox','name'=>'clients','data'=>1,'value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));


@@ -252,7 +252,7 @@ if ($request->isPost()) {
         'week_start' => $cl_start_week,
         'tracking_mode' => $cl_tracking_mode,
         'record_type' => $cl_record_type,
         'week_start' => $cl_start_week,
         'tracking_mode' => $cl_tracking_mode,
         'record_type' => $cl_record_type,

-        'uncompleted_entries' => $cl_uncompleted_entries,
+        'uncompleted_indicators' => $cl_uncompleted_indicators,

         'plugins' => $plugins));
     }
     if ($update_result) {
         'plugins' => $plugins));
     }
     if ($update_result) {