[Rt-commit] rt branch, 4.4/cf-entry-hint, updated. rt-4.2.3-23-gc560350

[? sunnavy]

The branch, 4.4/cf-entry-hint has been updated
       via  c56035053a75a33a45c817e4ebfa95134e274359 (commit)
      from  5cb59368955e63a0b3701081a8edf1af04a7b9cf (commit)

Summary of changes:
 share/html/Articles/Article/Elements/EditCustomFields  | 2 +-
 share/html/Elements/BulkCustomFields                   | 2 +-
 share/html/Elements/EditCustomFields                   | 2 +-
 share/html/Search/Bulk.html                            | 2 +-
 share/html/Ticket/Elements/EditTransactionCustomFields | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit c56035053a75a33a45c817e4ebfa95134e274359
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Feb 25 17:00:55 2014 +0800

    show EntryHint instead of FriendlyType on cf create/update

diff --git a/share/html/Articles/Article/Elements/EditCustomFields b/share/html/Articles/Article/Elements/EditCustomFields
index e3aaf3e..e951873 100644
--- a/share/html/Articles/Article/Elements/EditCustomFields
+++ b/share/html/Articles/Article/Elements/EditCustomFields
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 % while (my $CustomField = $CustomFields->Next()) {
 <tr>
-    <td class="labeltop"><b><%$CustomField->Name%></b><br /><i><%$CustomField->FriendlyType%></i></td>
+    <td class="labeltop"><b><%$CustomField->Name%></b><br /><i><%$CustomField->EntryHint // ''%></i></td>
     <td class="entry"><& /Elements/EditCustomField, 
         Object => $ArticleObj, 
         CustomField => $CustomField, 
diff --git a/share/html/Elements/BulkCustomFields b/share/html/Elements/BulkCustomFields
index 1eb3d59..292dbec 100644
--- a/share/html/Elements/BulkCustomFields
+++ b/share/html/Elements/BulkCustomFields
@@ -56,7 +56,7 @@
 % while (my $cf = $CustomFields->Next) {
 <tr class="<% ++$i%2 ? 'oddline': 'evenline' %>">
 <td class="label"><% $cf->Name %><br />
-<em>(<% $cf->FriendlyType %>)</em></td>
+<em>(<% $cf->EntryHint // '' %>)</em></td>
 % my $rows = 5;
 % my $cf_id = $cf->id;
 % my @add = (NamePrefix => 'Bulk-Add-CustomField-', CustomField => $cf, Rows => $rows,
diff --git a/share/html/Elements/EditCustomFields b/share/html/Elements/EditCustomFields
index 57cf673..161f94d 100644
--- a/share/html/Elements/EditCustomFields
+++ b/share/html/Elements/EditCustomFields
@@ -57,7 +57,7 @@
   <<% $FIELD %> class="edit-custom-field cftype-<% $Type %>">
     <<% $CELL %> class="cflabel">
       <span class="name"><% $CustomField->Name %>:</span><br />
-      <span class="type"><% $CustomField->FriendlyType %></span>
+      <span class="type"><% $CustomField->EntryHint // '' %></span>
     </<% $CELL %>>
     <<% $CELL %> class="entry">
 % my $default = $m->notes('Field-' . $CustomField->Id);
diff --git a/share/html/Search/Bulk.html b/share/html/Search/Bulk.html
index 69adea1..dbebc81 100644
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
@@ -136,7 +136,7 @@ size="60" value="<% $ARGS{UpdateSubject} || "" %>" /></td></tr>
 <td><& /Elements/EditCustomField,
     CustomField => $CF,
     Object => RT::Transaction->new( $session{'CurrentUser'} ),
-    &><em><% $CF->FriendlyType %></em></td>
+    &><em><% $CF->EntryHint // '' %></em></td>
 </td></tr>
 % } # end if while
 
diff --git a/share/html/Ticket/Elements/EditTransactionCustomFields b/share/html/Ticket/Elements/EditTransactionCustomFields
index f64666a..49a5224 100644
--- a/share/html/Ticket/Elements/EditTransactionCustomFields
+++ b/share/html/Ticket/Elements/EditTransactionCustomFields
@@ -55,7 +55,7 @@
 <<% $FIELD %>>
 <<% $CELL %> class="label cflabel">
   <span class="name"><% $CF->Name %>:</span><br />
-  <span class="type"><% $CF->FriendlyType %></span>
+  <span class="type"><% $CF->EntryHint // '' %></span>
 </<% $CELL %>>
 <<% $CELL %>>
 <& /Elements/EditCustomField,

-----------------------------------------------------------------------