improve sorting of requirements command output
This commit is contained in:
parent
dadcf62281
commit
9ce8cd0725
|
@ -25,13 +25,12 @@ class List(Lister):
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
def take_action(self, parsed_args):
|
||||||
session = self.app.get_db_session()
|
session = self.app.get_db_session()
|
||||||
query = session.query(models.Project).filter(
|
query = session.query(req_models.Requirement).join(models.Project).filter(
|
||||||
models.Project.name == parsed_args.project
|
models.Project.name == parsed_args.project
|
||||||
)
|
).order_by(req_models.Requirement.name)
|
||||||
proj_obj = query.one()
|
|
||||||
return (('Name', 'Spec', 'File'),
|
return (('Name', 'Spec', 'File'),
|
||||||
((r.name, r.line.content.strip(), r.line.file.name)
|
((r.name, r.line.content.strip(), r.line.file.name)
|
||||||
for r in proj_obj.requirements))
|
for r in query.all()))
|
||||||
|
|
||||||
|
|
||||||
class Uses(Lister):
|
class Uses(Lister):
|
||||||
|
@ -49,8 +48,8 @@ class Uses(Lister):
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
def take_action(self, parsed_args):
|
||||||
session = self.app.get_db_session()
|
session = self.app.get_db_session()
|
||||||
query = session.query(req_models.Requirement).filter(
|
query = session.query(req_models.Requirement).join(models.Project).filter(
|
||||||
req_models.Requirement.name == parsed_args.requirement
|
req_models.Requirement.name == parsed_args.requirement
|
||||||
)
|
).order_by(models.Project.name)
|
||||||
return (('Name', 'Spec', 'File'),
|
return (('Name', 'Spec', 'File'),
|
||||||
((r.project.name, r.line.content.strip(), r.line.file.name) for r in query.all()))
|
((r.project.name, r.line.content.strip(), r.line.file.name) for r in query.all()))
|
||||||
|
|
Loading…
Reference in New Issue