vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Merge pull request #968 from DeterminateSystems/unnecessary-declarative-field

Browse source 
Projects: don't respond with unnecessary declarative field
This commit is contained in:
Graham Christensen 2021-05-24 19:21:00 -04:00 committed by GitHub
commit 5b6b8261fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/lib/Hydra/Schema/Projects.pm
View file

@ -263,15 +263,19 @@ sub as_json {
"enabled" => $self->get_column("enabled") ? JSON::true : JSON::false,
"hidden" => $self->get_column("hidden") ? JSON::true : JSON::false,
"jobsets" => [ map { $_->name } $self->jobsets ]
);
my %decl = (
"declarative" => {
"file" => $self->get_column("declfile") // "",
"type" => $self->get_column("decltype") // "",
"value" => $self->get_column("declvalue") // ""
},
"jobsets" => [ map { $_->name } $self->jobsets ]
}
);
%json = (%json, %decl) if !($decl{"declarative"}->{"file"} eq "");
return \%json;
}

14
t/Controller/projects.t
View file

@ -49,12 +49,7 @@ subtest "Read project 'tests'" => sub {
homepage => "",
jobsets => [],
name => "tests",
owner => "root",
declarative => {
file => "",
type => "",
value => ""
}
owner => "root"
});
};
@ -136,12 +131,7 @@ subtest "Transitioning from declarative project to normal" => sub {
homepage => "",
jobsets => [],
name => "tests",
owner => "root",
declarative => {
file => "",
type => "",
value => ""
}
owner => "root"
});
};
};