More work in progress on custom fields extension.

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 960ed0b232d8b74ad73f20b5ff8379987c7f8628..0f0b4c7fc0115966e3a9d4bf910a98b218eab3de 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -415,6 +415,7 @@ $i18n_key_words = array(
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projectes',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 1d1da5248a38e8c79da1e17e3a0d55b78eadcba5..9000b3b19bf3ba0a08df837f6946624ce431c948 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -425,6 +425,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'od počátku',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekty',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index b1afacb7bd9172621c86daf8a48fce665a6b33ea..c176763184bafe13ec73bc9611882eb175c16de1 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -398,6 +398,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'Alt',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projekter',
 'dropdown.tasks' => 'Opgaver',
 'dropdown.clients' => 'Klienter',

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9524dad63ce0c1f3acdce171af14fae652f8ccaa..9fe12dfcafa8b3cfbb6d986967d106bf9639745f 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -380,6 +380,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'Gesamtzeitraum',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projekte',
 'dropdown.tasks' => 'Aufgaben',
 'dropdown.clients' => 'Kunden',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ef89c364b5c8c3a2ef12d12d8ee969aeb65d0f18..7d25fd6907433e01d78ebadbe184203d71fd662a 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -364,6 +364,7 @@ $i18n_key_words = array(
 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => 'all time',
 'dropdown.time' => 'time',
+'dropdown.user' => 'user',
 'dropdown.projects' => 'projects',
 'dropdown.tasks' => 'tasks',
 'dropdown.clients' => 'clients',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 5fd0ac430765b342631f1eda07ebb68525d20627..44ed2567ab1b240196d73ffab22dfaf376150ccb 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -415,6 +415,7 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'dropdown.all_time' => 'all time',
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'proyectos',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 3eea2d0edec31151feca2de4a900099da5941bd2..34a7239b1a586b722b00a1b88076aeb8399cd0f0 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -403,6 +403,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'kõik ajavahemikud',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projektid',
 'dropdown.tasks' => 'tööülesanded',
 'dropdown.clients' => 'kliendid',

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 3b6e9d81e0dcc4b0210fcf23955ab83967d206fe..3095a87e48ce196c3f2dce843efa40560910d4fe 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -409,6 +409,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'همه زمان ها',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'پروژه ها',
 'dropdown.tasks' => 'وظایف',
 'dropdown.clients' => 'مشتریان',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1aa06d567d0ffaa99c88837161647910699da4c8..752c6ffd40da0754a476b39566f474a4fef02923 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -398,6 +398,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'kaikki tunnit',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projektit',
 'dropdown.tasks' => 'tehtävät',
 'dropdown.clients' => 'asiakkaat',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index cb4883726f94494c60d535d398563f75d9af7fac..ff7e4e6f753b5e715352e07b9d4c74ae5ecb84b5 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -390,6 +390,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'depuis toujours',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projets',
 'dropdown.tasks' => 'Tâches',
 'dropdown.clients' => 'Clients',

diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index c8a8ab08896a7b834658233d8682151cd0d64b9a..1e3c8be976b7426341e7d4d6171949aefdf6086e 100644 (file)
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -388,6 +388,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'όλη την περίοδο',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'έργα',
 'dropdown.tasks' => 'εργασίες',
 'dropdown.clients' => 'πελάτες',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 10a40edcf94d812a431cf69ef7bf06009546b8f5..2905e274a59f9231a275310421f9b1ceff56312b 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -415,6 +415,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'הכל',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'פרוייקטים',
 'dropdown.tasks' => 'משימות',
 'dropdown.clients' => 'לקוחות',

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 95d990466167d6d6ab87231806ff9b7ad18072e6..d44c8d8a0bcc801a956fc3d36395f3d869571407 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -417,6 +417,7 @@ $i18n_key_words = array(
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projektek',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 845b1d10facda39636ea031278cb9d07e405b052..a1efcd52186abfc29257805db8d2e41574498ab7 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -398,6 +398,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'tutto il tempo',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'progetti',
 'dropdown.tasks' => 'compiti',
 'dropdown.clients' => 'clienti',

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3b9c091ece8af2e96d8bc7dea608be3d409bb6f7..1fadd683e2e05222fd49713f58b97b75b8ab13dc 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -421,6 +421,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'すべての時間',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'プロジェクト',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 43d3f8ad1087472b2729829ed27246ce106d85d3..115a96a501335bd649ff356a0f76ff567ac8d982 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -424,6 +424,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => '전시간',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => '프로젝트',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 49125a648689022215a08a489037904915f25853..58d3aaaa2de1303220bfbc1ed64093df3b9c021c 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -365,6 +365,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'alles',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projecten',
 'dropdown.tasks' => 'taken',
 'dropdown.clients' => 'klanten',

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 04ccf3c643667b0a9beaa42fbaafe420f6f09ddb..27d6a91ba6e5b8eb24d13231b52104faa39264b0 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -419,6 +419,7 @@ $i18n_key_words = array(
 // 'dropdown.all_time' => 'all time',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'prosjekter',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 3f0d93bff2209e05caa22b59123e2c6c09b070cc..aa6a2ceffcae9b659a755254596078a6ca7b6632 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -401,6 +401,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'od początku',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekty',
 'dropdown.tasks' => 'zadania',
 'dropdown.clients' => 'klienci',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index ef6eacee24b11a16191b316a0809496e0aba3f58..3d1d0abe8640c282de1152e7be68ef080d6ac519 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -396,6 +396,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'todas as datas',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projetos',
 'dropdown.tasks' => 'tarefas',
 'dropdown.clients' => 'clientes',

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 79bbae1ceba602ba408524fe7d8f7addae3f6374..2720464a246aa4061026942ccd0fb57c8d92e84d 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -404,6 +404,7 @@ $i18n_key_words = array(
 // 'dropdown.all_time' => 'all time',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projetos',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index fc9f67e56635a722fbda1e762f90b50b415c0659..64b4551ccf347c97304f2a7cc48ae98957704f2a 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -421,6 +421,7 @@ $i18n_key_words = array(
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'proiecte',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 22c666fe264c46e02a44ad8bfdf9c3a66c3fd0c0..980aa466e6bccd704376e2b572fcef1cb0c15175 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -361,6 +361,7 @@ $i18n_key_words = array(
 'dropdown.selected_year' => 'год',
 'dropdown.all_time' => 'всё время',
 'dropdown.time' => 'время',
+'dropdown.user' => 'пользователь',
 'dropdown.projects' => 'проекты',
 'dropdown.tasks' => 'задачи',
 'dropdown.clients' => 'клиенты',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 133f80f0c46cc4e88cc5cd05178bfe49b20cfc4a..56d14f6652fbc3bfe24ebf413ce6efc1b9110856 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -405,6 +405,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'celý čas',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekty',
 'dropdown.tasks' => 'úlohy',
 // TODO: translate the following.

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index f0220996389002842d0d8141491b938763f857fa..db54f19e1bb3d7ec246fe395430aea678ba572f5 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -395,6 +395,7 @@ $i18n_key_words = array(
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekti',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index d8f8986e413e7412f39be0aa7fae14edd061519b..eb8f3ebf0961433c6a06413ace369b7f607e361e 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -399,6 +399,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'svi datumi',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekti',
 'dropdown.tasks' => 'zadaci',
 'dropdown.clients' => 'klijenti',

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 97392f9eb0df2ae353450067e85db4d2a15ac832..c17662baad07a25fd6beb252279c33cfacaac0ce 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -398,6 +398,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'Livstid',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projekt',
 'dropdown.tasks' => 'Arbetsuppgifter',
 'dropdown.clients' => 'Kunder',

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 39c39e8f4052768b5853301bfb4a118721dc319b..5701f5621b95a5d54aba19106602c325e168d319 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -430,6 +430,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => 'tüm zamanlar',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projeler',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7493be7a0dfc24cf49f6d382a2b15b1133e1113f..dce6df857e2463e6215d9946027d7c62a8d64a31 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -411,6 +411,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => '全部时间',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => '项目',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index b8d923b8d46096b4157802365dd48dac0b970bd9..a18cb213b4176924a8bb6a73061fb42335dbb521 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -416,6 +416,7 @@ $i18n_key_words = array(
 'dropdown.all_time' => '全部時間',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => '項目',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',

diff --git a/WEB-INF/templates/cf_custom_field_add.tpl b/WEB-INF/templates/cf_custom_field_add.tpl
index 442f41bb876278ecfd13d63357b207c965b343d6..4c343eec906c9a627ac12aea75280d8b3f6aebdf 100644 (file)
--- a/WEB-INF/templates/cf_custom_field_add.tpl
+++ b/WEB-INF/templates/cf_custom_field_add.tpl
@@ -8,6 +8,12 @@
           <td align="right">{$i18n.label.thing_name} (*):</td>
           <td>{$forms.fieldForm.name.control}</td>
         </tr>
+{if isTrue('CF_DEBUG')}
+        <tr>
+          <td align="right">{$i18n.label.entity}:</td>
+          <td>{$forms.fieldForm.entity.control} <a href="https://www.anuko.com/lp/tt_39.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+{/if}
         <tr>
           <td align="right">{$i18n.label.type}:</td>
           <td>{$forms.fieldForm.type.control}</td>

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 59b49cfe1f2190fa597687ab60beb6f824be0971..265b35fe2e97a66b0d3f85a37eaacf31bf1aae78 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.19.5.5017 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.19.5.5018 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index c22c10e5bd1108a86c738c96e9645e9951927644..e4a919eb595883c52b0a7118a244856020752351 100644 (file)
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -49,7 +49,7 @@ if (count($fields) >= 1) {
 
 if ($request->isPost()) {
   $cl_field_name = trim($request->getParameter('name'));
-  $cl_field_entity = $request->getParameter('entity');
+  $cl_entity_type = $request->getParameter('entity');
   $cl_field_type = $request->getParameter('type');
   $cl_required = $request->getParameter('required');
   if (!$cl_required)
@@ -59,8 +59,8 @@ if ($request->isPost()) {
 $form = new Form('fieldForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>''));
 $form->addInput(array('type'=>'combobox','name'=>'entity',
-  'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('label.type_text'),
-                CustomFields::ENTITY_USER=>$i18n->get('label.user'))
+  'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('dropdown.time'),
+                CustomFields::ENTITY_USER=>$i18n->get('dropdown.user'))
 ));
 $form->addInput(array('type'=>'combobox','name'=>'type',
   'data'=>array(CustomFields::TYPE_TEXT=>$i18n->get('label.type_text'),
@@ -74,7 +74,7 @@ if ($request->isPost()) {
   if (!ttValidString($cl_field_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
 
   if ($err->no()) {
-    $res = CustomFields::insertField($cl_field_name, $cl_field_type, $cl_required);
+    $res = CustomFields::insertField($cl_field_name, $cl_entity_type, $cl_field_type, $cl_required);
     if ($res) {
       header('Location: cf_custom_fields.php');
       exit();

diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index ce870a94d7c47451d94c4653706929eda117bcf8..a0c49ec5671ae172d1bec0bf22ede3b0294224b3 100644 (file)
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -32,7 +32,7 @@ class CustomFields {
   const ENTITY_TIME = 1;    // Field is associated with time entries.
   const ENTITY_USER = 2;    // Field is associated with users.
   const ENTITY_PROJECT = 3; // Field is associated with projects.
-    
+
   const TYPE_TEXT = 1;     // A text field.
   const TYPE_DROPDOWN = 2; // A dropdown field with pre-defined values.
 
@@ -301,7 +301,7 @@ class CustomFields {
   }
 
   // The insertField inserts a custom field for group.
-  static function insertField($field_name, $field_type, $required) {
+  static function insertField($field_name, $entity_type, $field_type, $required) {
     global $user;
     $mdb2 = getConnection();