huskies: merge 1088
This commit is contained in:
@@ -62,6 +62,9 @@ pub struct WorkItemContent {
|
||||
pub stage: crate::pipeline_state::Stage,
|
||||
pub name: String,
|
||||
pub agent: Option<crate::config::AgentName>,
|
||||
/// Origin of the work item (story 1088). `None` for items that pre-date
|
||||
/// the origin register; the web UI renders these as `"unknown"`.
|
||||
pub origin: Option<String>,
|
||||
}
|
||||
|
||||
/// A single entry in the project's configured agent roster.
|
||||
@@ -176,6 +179,9 @@ pub fn get_work_item_content(
|
||||
.map(|v| v.name().to_string())
|
||||
.unwrap_or_default();
|
||||
let crdt_agent = crdt_view.as_ref().and_then(|v| v.agent());
|
||||
let crdt_origin = crdt_view
|
||||
.as_ref()
|
||||
.and_then(|v| v.origin().map(str::to_string));
|
||||
|
||||
for (stage_dir, stage) in &stages {
|
||||
if let Some(content) = io::read_work_item_from_stage(&work_dir, stage_dir, &filename)? {
|
||||
@@ -184,6 +190,7 @@ pub fn get_work_item_content(
|
||||
stage: stage.clone(),
|
||||
name: crdt_name.clone(),
|
||||
agent: crdt_agent,
|
||||
origin: crdt_origin.clone(),
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -201,6 +208,7 @@ pub fn get_work_item_content(
|
||||
stage,
|
||||
name: crdt_name,
|
||||
agent: crdt_agent,
|
||||
origin: crdt_origin,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user