Unverified Commit 9cd04685 authored by John Chilton's avatar John Chilton Committed by GitHub
Browse files

Merge pull request #10431 from mvdbeek/collection_identifier_handling 

[20.01] Backport #10427: Fix handling of collection element identifiers in history panel
parents a7765ba0 4588977a

client/galaxy/scripts/mvc/dataset/dataset-li-edit.js

+2 −1
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@ var DatasetListItemEdit = _super.extend( 
                    const Galaxy = getGalaxyInstance();

                    if (Galaxy.router) {

                        ev.preventDefault();

                        const identifier = self.model.get("element_id") || self.model.get("id");

                        Galaxy.router.push("datasets/edit", {

                            dataset_id: self.model.attributes.id

                            dataset_id: identifier

                        });

                    }

                }

client/galaxy/scripts/mvc/dataset/dataset-li.js

+2 −1
Original line number Diff line number Diff line
@@ -184,7 +184,8 @@ export var DatasetListItemView = _super.extend( 
                    const Galaxy = getGalaxyInstance();

                    if (Galaxy.frame && Galaxy.frame.active) {

                        // Add dataset to frames.

                        Galaxy.frame.addDataset(self.model.get("id"));

                        const identifier = self.model.get("element_id") || self.model.get("id");

                        Galaxy.frame.addDataset(identifier);

                        ev.preventDefault();

                    }

                };