Skip to content

Commit

Permalink
Merge pull request #17434 from guerler/grid_removal
Browse files Browse the repository at this point in the history
Removes outdated Grid controller and backbone modules
  • Loading branch information
bgruening authored Feb 11, 2024
2 parents e943c17 + 66cca93 commit 8476819
Show file tree
Hide file tree
Showing 25 changed files with 34 additions and 3,338 deletions.
2 changes: 1 addition & 1 deletion client/src/components/Grid/GridList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ watch(operationMessage, () => {
:title="rowData[fieldEntry.key]"
@execute="onOperation($event, rowData)" />
<GridBoolean v-else-if="fieldEntry.type == 'boolean'" :value="rowData[fieldEntry.key]" />
<GridDatasets v-else-if="fieldEntry.type == 'datasets'" :historyId="rowData[fieldEntry.key]" />
<GridDatasets v-else-if="fieldEntry.type == 'datasets'" :history-id="rowData[fieldEntry.key]" />
<GridText v-else-if="fieldEntry.type == 'text'" :text="rowData[fieldEntry.key]" />
<GridLink
v-else-if="fieldEntry.type == 'link'"
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Grid/configs/adminUsers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ const gridConfig: GridConfig = {
plural: "Users",
sortBy: "email",
sortDesc: true,
sortKeys: ["active", "create_time", "disk_usage", "email", "external", "last_login", "status", "username"],
sortKeys: ["active", "create_time", "disk_usage", "email", "external", "last_login", "username"],
title: "Users",
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { getGalaxyInstance } from "app";
import Backbone from "backbone";
import { Toast } from "composables/toast";
import $ from "jquery";
import mod_select from "mvc/ui/ui-select";
import { getAppRoot } from "onload/loadConfig";
import _ from "underscore";
import _l from "utils/localization";

import { updateProgress } from "./delete-selected";
import mod_library_model from "./library-model";
import mod_select from "./ui-select";

var AddDatasets = Backbone.View.extend({
options: null,
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion client/src/legacy/grid/grid-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jQuery.ajaxSettings.traditional = true;
import Utils from "utils/utils";
import GridModel from "legacy/grid/grid-model";
import Templates from "legacy/grid/grid-template";
import PopupMenu from "mvc/ui/popup-menu";
import PopupMenu from "./popup-menu";
import { init_refresh_on_change } from "onload/globalInits/init_refresh_on_change";

var $ = jQuery;
Expand Down
File renamed without changes.
111 changes: 0 additions & 111 deletions client/src/mvc/grid/grid-model.js

This file was deleted.

Loading

0 comments on commit 8476819

Please sign in to comment.