[freeside-commits] freeside/FS/FS Schema.pm, 1.317.2.32, 1.317.2.33 hardware_class.pm, 1.1, 1.1.2.1 hardware_type.pm, 1.1, 1.1.2.1

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv1487/FS/FS

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	Schema.pm hardware_class.pm hardware_type.pm 
Log Message:
svc_hardware revision number, #16266

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.317.2.32
retrieving revision 1.317.2.33
diff -u -w -d -r1.317.2.32 -r1.317.2.33
--- Schema.pm	28 Jan 2012 23:20:31 -0000	1.317.2.32
+++ Schema.pm	16 Feb 2012 02:13:38 -0000	1.317.2.33
@@ -2132,9 +2132,10 @@
         'typenum',  'serial', '',      '', '', '',
         'classnum',    'int', '',      '', '', '',
         'model',   'varchar', '', $char_d, '', '',
+        'revision','varchar', 'NULL', $char_d, '', '',
       ],
       'primary_key' => 'typenum',
-      'unique' => [ ],
+      'unique' => [ [ 'classnum', 'model', 'revision' ] ],
       'index'  => [ ],
     },
 

Index: hardware_class.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/hardware_class.pm,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -w -d -r1.1 -r1.1.2.1
--- hardware_class.pm	1 Apr 2011 02:52:12 -0000	1.1
+++ hardware_class.pm	16 Feb 2012 02:13:38 -0000	1.1.2.1
@@ -112,7 +112,11 @@
 
 sub hardware_type {
   my $self = shift;
-  return qsearch('hardware_type', { 'classnum' => $self->classnum });
+  qsearch({
+      table   => 'hardware_type',
+      hashref => { 'classnum' => $self->classnum },
+      order_by=> 'ORDER BY model, revision',
+  })
 }
 
 =back

Index: hardware_type.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/hardware_type.pm,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -w -d -r1.1 -r1.1.2.1
--- hardware_type.pm	1 Apr 2011 02:52:12 -0000	1.1
+++ hardware_type.pm	16 Feb 2012 02:13:38 -0000	1.1.2.1
@@ -39,6 +39,8 @@
 
 =item model - descriptive model name or number
 
+=item revision - revision name/number, subordinate to model
+
 =back
 
 =head1 METHODS
@@ -102,6 +104,7 @@
     $self->ut_numbern('typenum')
     || $self->ut_foreign_key('classnum', 'hardware_class', 'classnum')
     || $self->ut_text('model')
+    || $self->ut_textn('revision')
   ;
   return $error if $error;
 
@@ -119,6 +122,17 @@
   return qsearchs('hardware_class', { 'classnum' => $self->classnum });
 }
 
+=item description
+
+Returns the model and revision number.
+
+=cut
+
+sub description {
+  my $self = shift;
+  $self->model . ($self->revision ? ' '.$self->revision : '');
+}
+
 =back
 
 =head1 SEE ALSO