Skip to content

Commit abc554b

Browse files
committed
fix #3451
1 parent ea0a7ec commit abc554b

File tree

4 files changed

+286
-152
lines changed

4 files changed

+286
-152
lines changed

qiita_db/util.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2114,7 +2114,7 @@ def generate_analysis_list(analysis_ids, public_only=False):
21142114
return []
21152115

21162116
sql = """
2117-
SELECT analysis_id, a.name, a.description, a.timestamp,
2117+
SELECT analysis_id, a.name, a.description, a.timestamp, a.email,
21182118
array_agg(DISTINCT artifact_id),
21192119
array_agg(DISTINCT visibility),
21202120
array_agg(DISTINCT CASE WHEN filepath_type = 'plain_text'
@@ -2135,7 +2135,8 @@ def generate_analysis_list(analysis_ids, public_only=False):
21352135

21362136
qdb.sql_connection.TRN.add(sql, [tuple(analysis_ids)])
21372137
for row in qdb.sql_connection.TRN.execute_fetchindex():
2138-
aid, name, description, ts, artifacts, av, mapping_files = row
2138+
aid, name, description, ts, owner, artifacts, \
2139+
av, mapping_files = row
21392140

21402141
av = 'public' if set(av) == {'public'} else 'private'
21412142
if av != 'public' and public_only:
@@ -2156,7 +2157,7 @@ def generate_analysis_list(analysis_ids, public_only=False):
21562157
results.append({
21572158
'analysis_id': aid, 'name': name, 'description': description,
21582159
'timestamp': ts.strftime("%m/%d/%y %H:%M:%S"),
2159-
'visibility': av, 'artifacts': artifacts,
2160+
'visibility': av, 'artifacts': artifacts, 'owner': owner,
21602161
'mapping_files': mapping_files})
21612162

21622163
return results

qiita_pet/handlers/analysis_handlers/base_handlers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ def analysis_description_handler_get_request(analysis_id, user):
8585
'analysis_is_public': analysis.is_public,
8686
'analysis_description': analysis.description,
8787
'analysis_mapping_id': analysis.mapping_file,
88+
'analysis_owner': analysis.owner.email,
8889
'alert_type': alert_type,
8990
'artifacts': artifacts,
9091
'analysis_reservation': analysis._slurm_reservation()[0],

0 commit comments

Comments
 (0)