projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
hardware_type.pm
diff --git
a/FS/FS/hardware_type.pm
b/FS/FS/hardware_type.pm
index
ba19fcb
..
615c314
100644
(file)
--- a/
FS/FS/hardware_type.pm
+++ b/
FS/FS/hardware_type.pm
@@
-1,8
+1,7
@@
package FS::hardware_type;
package FS::hardware_type;
+use base qw( FS::Record );
use strict;
use strict;
-use base qw( FS::Record );
-use FS::Record qw( qsearch qsearchs );
=head1 NAME
=head1 NAME
@@
-39,6
+38,8
@@
to which this device type belongs.
=item model - descriptive model name or number
=item model - descriptive model name or number
+=item revision - revision name/number, subordinate to model
+
=back
=head1 METHODS
=back
=head1 METHODS
@@
-102,6
+103,7
@@
sub check {
$self->ut_numbern('typenum')
|| $self->ut_foreign_key('classnum', 'hardware_class', 'classnum')
|| $self->ut_text('model')
$self->ut_numbern('typenum')
|| $self->ut_foreign_key('classnum', 'hardware_class', 'classnum')
|| $self->ut_text('model')
+ || $self->ut_textn('revision')
;
return $error if $error;
;
return $error if $error;
@@
-112,11
+114,15
@@
sub check {
Returns the L<FS::hardware_class> associated with this device.
Returns the L<FS::hardware_class> associated with this device.
+=item description
+
+Returns the model and revision number.
+
=cut
=cut
-sub
hardware_class
{
+sub
description
{
my $self = shift;
my $self = shift;
-
return qsearchs('hardware_class', { 'classnum' => $self->classnum }
);
+
$self->model . ($self->revision ? ' '.$self->revision : ''
);
}
=back
}
=back