Some more renaming.

diff --git a/WEB-INF/templates/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl
index bd2f0f4f3304232c20a8f2482661fcadc00d583a..e43f0f673cfa51dd43f8267d0837cb1d3ba33e73 100644 (file)
--- a/WEB-INF/templates/mobile/users.tpl
+++ b/WEB-INF/templates/mobile/users.tpl
@@ -19,7 +19,7 @@
     {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
           <td>
     {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
           <td>

-            {if $smarty.const.ENTRIES_USERS_PAGE == $user->uncompleted_entries}
+            {if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_entries}

               <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
             {/if}
             {if $user->isManager()}
               <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
             {/if}
             {if $user->isManager()}

diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index d537ddad81fce113e212f4f53c4e721b33762b2b..84e3d0e5526b34de4ce2e6d654910e52376eef8b 100644 (file)
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -21,7 +21,7 @@
     {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
           <td>
     {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
           <td>

-          {if $smarty.const.ENTRIES_USERS_PAGE == $user->uncompleted_entries}
+          {if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_entries}

             <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
           {/if}
             {$u.name|escape:'html'}
             <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
           {/if}
             {$u.name|escape:'html'}

diff --git a/mobile/users.php b/mobile/users.php
index c4f65d9cdfeb4ea51d989803ca43ba21951364af..021845882b983a51dde6ac235d62cc8f0364ff52 100644 (file)
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -45,7 +45,7 @@ if($user->canManageTeam()) {
 }
 
 // Check if the user wants to show uncompleted time entries.
 }
 
 // Check if the user wants to show uncompleted time entries.

-if (ENTRIES_USERS_PAGE == $user->uncompleted_entries) {
+if (UNCOMPLETED_INDICATORS == $user->uncompleted_entries) {

   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {
     $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {
     $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);

diff --git a/users.php b/users.php
index 15850d2410a3d493c72d63df65ab19626117246e..b1fe52a0baa5aa9f2aba255fc8e32aaced978d2e 100644 (file)
--- a/users.php
+++ b/users.php
@@ -45,7 +45,7 @@ if($user->canManageTeam()) {
 }
 
 // Check if the user wants to show uncompleted time entries.
 }
 
 // Check if the user wants to show uncompleted time entries.

-if (ENTRIES_USERS_PAGE == $user->uncompleted_entries) {
+if (UNCOMPLETED_INDICATORS == $user->uncompleted_entries) {

   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {
     $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {
     $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);