Fix editvisibility based on component
parent
ae75b4e493
commit
6a9039b06e
|
@ -91,26 +91,32 @@ sub new
|
|||
my $product;
|
||||
if (ref $param)
|
||||
{
|
||||
$product = $param->{product};
|
||||
my $name = $param->{name};
|
||||
if (!defined $product)
|
||||
if ($param->{id})
|
||||
{
|
||||
ThrowCodeError('bad_arg', {
|
||||
argument => 'product',
|
||||
function => "${class}::new",
|
||||
});
|
||||
$param = { condition => 'id = ?', values => [ $param->{id} ] };
|
||||
}
|
||||
if (!defined $name)
|
||||
else
|
||||
{
|
||||
ThrowCodeError('bad_arg', {
|
||||
argument => 'name',
|
||||
function => "${class}::new",
|
||||
});
|
||||
$product = $param->{product};
|
||||
my $name = $param->{name};
|
||||
if (!defined $product)
|
||||
{
|
||||
ThrowCodeError('bad_arg', {
|
||||
argument => 'product',
|
||||
function => "${class}::new",
|
||||
});
|
||||
}
|
||||
if (!defined $name)
|
||||
{
|
||||
ThrowCodeError('bad_arg', {
|
||||
argument => 'name',
|
||||
function => "${class}::new",
|
||||
});
|
||||
}
|
||||
my $condition = 'product_id = ? AND name = ?';
|
||||
my @values = ($product->id, $name);
|
||||
$param = { condition => $condition, values => \@values };
|
||||
}
|
||||
|
||||
my $condition = 'product_id = ? AND name = ?';
|
||||
my @values = ($product->id, $name);
|
||||
$param = { condition => $condition, values => \@values };
|
||||
}
|
||||
|
||||
unshift @_, $param;
|
||||
|
@ -507,6 +513,7 @@ sub description { return $_[0]->{description}; }
|
|||
sub wiki_url { return $_[0]->{wiki_url}; }
|
||||
sub product_id { return $_[0]->{product_id}; }
|
||||
sub is_active { return $_[0]->{isactive}; }
|
||||
sub full_name { return $_[0]->product->name.'/'.$_[0]->name; }
|
||||
|
||||
###############################
|
||||
#### Subroutines ####
|
||||
|
|
|
@ -314,6 +314,7 @@ sub get_all_names
|
|||
|
||||
sub is_active { return $_[0]->{isactive}; }
|
||||
sub sortkey { return $_[0]->{sortkey}; }
|
||||
sub full_name { return $_[0]->name; }
|
||||
|
||||
# FIXME Never use bug_count() on a copy from legal_values, as the result will be cached...
|
||||
sub bug_count
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Authors: Vitaliy Filippov <vitalif@mail.ru>, Vladimir Koptev <vladimir.koptev@gmail.com>
|
||||
#%]
|
||||
|
||||
[% SET title = "Select Active " _ field.description _ " Objects For " _ field.value_field.description _ ' ' _ visibility_value.name | html %]
|
||||
[% SET title = "Select Active " _ field.description _ " Objects For " _ field.value_field.description _ ' ' _ visibility_value.full_name | html %]
|
||||
|
||||
[% PROCESS global/header.html.tmpl %]
|
||||
|
||||
|
|
|
@ -114,7 +114,7 @@
|
|||
[% FOREACH field_value = field.value_field.legal_values %]
|
||||
[% IF field.visibility_field_id != field.value_field_id || field.has_visibility_value(field_value.id) %]
|
||||
<option value="[% field_value.id | none %]" [% ' selected="selected"' IF field.is_value_enabled(value.id, field_value.id) %]>
|
||||
[%- field_value.name | html -%]
|
||||
[%- field_value.full_name | html -%]
|
||||
</option>
|
||||
[% END %]
|
||||
[% END %]
|
||||
|
|
Loading…
Reference in New Issue