Skip to content

Commit

Permalink
Refactor client collections - renamed list collection edit to flat.
Browse files Browse the repository at this point in the history
Since it represents boths lists and paireds now.
  • Loading branch information
jmchilton committed Nov 30, 2017
1 parent 0c1e6e4 commit 1535a0f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions client/galaxy/scripts/mvc/collection/collection-view-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ var CollectionViewEdit = _super.extend(

// =============================================================================
/** @class non-editable, read-only View/Controller for a dataset collection. */
var ListCollectionViewEdit = CollectionViewEdit.extend(
var FlatCollectionViewEdit = CollectionViewEdit.extend(
/** @lends ListCollectionView.prototype */ {
//TODO: not strictly needed - due to switch in CollectionView._getContentClass
/** sub view class used for datasets */
Expand All @@ -101,7 +101,7 @@ var ListCollectionViewEdit = CollectionViewEdit.extend(
// ........................................................................ misc
/** string rep */
toString: function() {
return `ListCollectionViewEdit(${this.model ? this.model.get("name") : ""})`;
return `FlatCollectionViewEdit(${this.model ? this.model.get("name") : ""})`;
}
}
);
Expand All @@ -110,7 +110,7 @@ var ListCollectionViewEdit = CollectionViewEdit.extend(
/** @class Editable (roughly since these collections are immutable),
* View/Controller for a dataset collection.
*/
var NestedPairCollectionViewEdit = ListCollectionViewEdit.extend(
var NestedPairCollectionViewEdit = FlatCollectionViewEdit.extend(
/** @lends NestedPairCollectionViewEdit.prototype */ {
/** Override to remove the editable text from the name/identifier - these collections are considered immutable */
_setUpBehaviors: function($where) {
Expand Down Expand Up @@ -164,7 +164,7 @@ var ListOfListsCollectionViewEdit = CollectionViewEdit.extend(
//==============================================================================
export default {
CollectionViewEdit: CollectionViewEdit,
ListCollectionViewEdit: ListCollectionViewEdit,
FlatCollectionViewEdit: FlatCollectionViewEdit,
ListOfPairsCollectionViewEdit: ListOfPairsCollectionViewEdit,
ListOfListsCollectionViewEdit: ListOfListsCollectionViewEdit
};
4 changes: 2 additions & 2 deletions client/galaxy/scripts/mvc/history/hdca-li-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ var HDCAListItemEdit = _super.extend(
var collectionType = this.model.get("collection_type");
switch (collectionType) {
case "list":
return DC_VIEW_EDIT.ListCollectionViewEdit;
return DC_VIEW_EDIT.FlatCollectionViewEdit;
case "paired":
return DC_VIEW_EDIT.ListCollectionViewEdit;
return DC_VIEW_EDIT.FlatCollectionViewEdit;
case "list:paired":
return DC_VIEW_EDIT.ListOfPairsCollectionViewEdit;
case "list:list":
Expand Down

0 comments on commit 1535a0f

Please sign in to comment.