From b90bf5bcccdc655ff79aa7a1f83c6bb88b66e8b7 Mon Sep 17 00:00:00 2001
From: "Eric A. Miller" <emiller@cpan.org>
Date: Wed, 28 May 2014 23:37:55 -0400
Subject: [PATCH] Move capitalizeFirstLetter() to netdisco.js as common utility
 function

---
 Netdisco/share/public/javascripts/netdisco.js |  5 ++++
 .../views/ajax/report/moduleinventory.tt      | 24 ++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Netdisco/share/public/javascripts/netdisco.js b/Netdisco/share/public/javascripts/netdisco.js
index 1750106d..bef4551e 100644
--- a/Netdisco/share/public/javascripts/netdisco.js
+++ b/Netdisco/share/public/javascripts/netdisco.js
@@ -156,6 +156,11 @@ function device_form_state(e) {
   }
 }
 
+//utility function for views
+function capitalizeFirstLetter(string) {
+    return string.charAt(0).toUpperCase() + string.slice(1);
+}
+
 $(document).ready(function() {
   // sidebar form fields should change colour and have bin/copy icon
   $('.nd_field-copy-icon').hide();
diff --git a/Netdisco/share/views/ajax/report/moduleinventory.tt b/Netdisco/share/views/ajax/report/moduleinventory.tt
index 53cf983f..333b0044 100644
--- a/Netdisco/share/views/ajax/report/moduleinventory.tt
+++ b/Netdisco/share/views/ajax/report/moduleinventory.tt
@@ -42,10 +42,6 @@
 [% END %]
 
 <script type="text/javascript">
-function capitaliseFirstLetter(string) {
-    return string.charAt(0).toUpperCase() + string.slice(1);
-}
-
 $(document).ready(function() {
   var table = $('#data-table').dataTable({
     "deferRender": true,
@@ -58,32 +54,32 @@ $(document).ready(function() {
         }
       }, {
         "data": 'description',
-        "render": function(data, type, full, meta) {
+        "render": function(data, type, row, meta) {
           return '<a href="[% uri_for('/report/moduleinventory') %]?description=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>';
         }
       }, {
         "data": 'name',
-        "render": function(data, type, full, meta) {
+        "render": function(data, type, row, meta) {
           return '<a href="[% uri_for('/report/moduleinventory') %]?name=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>';
         }
       }, {
         "data": 'class',
-        "render": function(data, type, full, meta) {
-          return '<a href="[% uri_for('/report/moduleinventory') %]?class=' + encodeURIComponent(data) + '">' + he.encode(capitaliseFirstLetter(data)) + '</a>';
+        "render": function(data, type, row, meta) {
+          return '<a href="[% uri_for('/report/moduleinventory') %]?class=' + encodeURIComponent(data) + '">' + he.encode(capitalizeFirstLetter(data)) + '</a>';
         }
       }, {
         "data": 'type',
-        "render": function(data, type, full, meta) {
+        "render": function(data, type, row, meta) {
           return '<a href="[% uri_for('/report/moduleinventory') %]?type=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>';
         }
       }, {
         "data": 'model',
-        "render": function(data, type, full, meta) {
+        "render": function(data, type, row, meta) {
           return '<a href="[% uri_for('/report/moduleinventory') %]?model=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>';
         }
       }, {
         "data": 'serial',
-        "render": function(data, type, full, meta) {
+        "render": function(data, type, row, meta) {
           return '<a href="[% uri_for('/report/moduleinventory') %]?serial=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>';
         }
       }, {
@@ -104,12 +100,12 @@ $(document).ready(function() {
       }
       [% ELSE %] {
         "data": 'class',
-        "render": function(data, type, full, meta) {
-          return '<a href="[% uri_for('/report/moduleinventory') %]?class=' + encodeURIComponent(data) + '">' + he.encode(capitaliseFirstLetter(data)) + '</a>';
+        "render": function(data, type, row, meta) {
+          return '<a href="[% uri_for('/report/moduleinventory') %]?class=' + encodeURIComponent(data) + '">' + he.encode(capitalizeFirstLetter(data)) + '</a>';
         }
       }, {
         "data": 'count',
-        "render": function(data, type, full, meta) {
+        "render": function(data, type, row, meta) {
           return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
         }
       }