From bda18fc78a9cc6b805b32f43988633b57d395e33 Mon Sep 17 00:00:00 2001
From: Abijah <Abijah@97e9348a-65ac-dc4b-aefc-98561f571b83>
Date: Tue, 4 Mar 2014 00:47:16 +0000
Subject: [PATCH] Changed field last_key to key_last

git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1047 97e9348a-65ac-dc4b-aefc-98561f571b83
---
 site/models/lock.php          |  2 +-
 site/views/elements/locks.ctp | 16 ++++++++--------
 site/views/locks/view.ctp     |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/site/models/lock.php b/site/models/lock.php
index 1c0191a..051a3ff 100644
--- a/site/models/lock.php
+++ b/site/models/lock.php
@@ -38,7 +38,7 @@ class Lock extends AppModel {
       $this->pr(5, compact('oldkey'));
 
       if ($this->field('key') != $data['Lock']['key']) {
-	$data['Lock']['last_key'] = $this->field('key');
+	$data['Lock']['key_last'] = $this->field('key');
 	$data['Lock']['key_ts'] = date('Y-m-d G:i:s');
       }
 
diff --git a/site/views/elements/locks.ctp b/site/views/elements/locks.ctp
index 9e42c9b..adda0b3 100644
--- a/site/views/elements/locks.ctp
+++ b/site/views/elements/locks.ctp
@@ -2,13 +2,13 @@
 
 // Define the table columns
 $cols = array();
-$cols['Name']     = array('index' => 'name',             'formatter' => 'name');
-$cols['Comment']  = array('index' => 'comment',          'formatter' => 'comment');
-$cols['Key']      = array('index' => 'key',              'formatter' => 'number');
-$cols['Last Key'] = array('index' => 'last_key',         'formatter' => 'number');
-$cols['Quantity'] = array('index' => 'qty',              'formatter' => 'number');
-$cols['In Use']   = array('index' => 'inuse',            'formatter' => 'number');
-$cols['Available']= array('index' => 'avail',            'formatter' => 'number');
+$cols['Name']         = array('index' => 'name',             'formatter' => 'name');
+$cols['Comment']      = array('index' => 'comment',          'formatter' => 'comment');
+$cols['Key/Combo']    = array('index' => 'key',              'formatter' => 'number');
+$cols['Previous Key'] = array('index' => 'key_last',         'formatter' => 'number');
+$cols['Quantity']     = array('index' => 'qty',              'formatter' => 'number');
+$cols['In Use']       = array('index' => 'inuse',            'formatter' => 'number');
+$cols['Available']    = array('index' => 'avail',            'formatter' => 'number');
 
 // Render the grid
 $grid
@@ -17,4 +17,4 @@ $grid
 ->defaultFields(array('Name'))
 ->searchFields(array('Name'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Last Key')));
+	 array_diff(array_keys($cols), array('Previous Key')));
diff --git a/site/views/locks/view.ctp b/site/views/locks/view.ctp
index caf8816..9e40e6c 100644
--- a/site/views/locks/view.ctp
+++ b/site/views/locks/view.ctp
@@ -16,8 +16,8 @@ $rows[] = array('Name',        $lock['name']);
 if ($lock['qty'] > 1)
   $rows[] = array('Quantity',    $lock['qty']);
 $rows[] = array('Key',         $lock['key']);
-if (!empty($lock['last_key'])) {
-  $rows[] = array('Last Key',    $lock['last_key'] . " (Changed on " . FormatHelper::datetime($lock['key_ts']) . ")");
+if (!empty($lock['key_last'])) {
+  $rows[] = array('Previous Key',    $lock['key_last'] . " (Changed on " . FormatHelper::datetime($lock['key_ts']) . ")");
 }
 $rows[] = array('Comment',     $lock['comment']);