Skip to content

Commit 7b6f445

Browse files
author
Akshara Hegde
committed
fix - sortable in jet dashboard
1 parent e59d8fb commit 7b6f445

File tree

19 files changed

+34847
-21
lines changed

19 files changed

+34847
-21
lines changed

jet/static/jet/css/_messages.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
ul.messagelist {
66
padding: 0;
7-
margin: 0;
87

98
li {
109
display: block;

jet/static/jet/css/themes/blowhorn/base.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/blowhorn/base.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/default/base.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/default/base.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/green/base.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/green/base.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/light-blue/base.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/light-blue/base.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/light-gray/base.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/light-gray/base.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/light-green/base.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/light-green/base.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/light-violet/base.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/themes/light-violet/base.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/css/vendor.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jet/static/jet/js/build/bundle.min.js

Lines changed: 34828 additions & 1 deletion
Large diffs are not rendered by default.

jet/static/jet/js/src/features/dashboard.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ var $ = require('jquery');
44
var t = require('../utils/translate');
55

66
require('jquery-ui/ui/unique-id');
7+
require('jquery-ui/ui/scroll-parent');
78
require('jquery-ui/ui/widget');
89
require('jquery-ui/ui/widgets/mouse');
910
require('jquery-ui/ui/widgets/draggable');
@@ -152,7 +153,7 @@ Dashboard.prototype = {
152153
$link.on('click', function (e) {
153154
e.preventDefault();
154155

155-
$collapsible.slide(200, 'swing', function () {
156+
$collapsible.slideFadeToggle(200, 'swing', function () {
156157
var collapsed = $collapsible.is(':visible') == false;
157158

158159
if (collapsed) {

jet/utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,13 @@ def get_model_queryset(admin_site, model, request, preserved_filters=None):
198198
list_select_related = model_admin.get_list_select_related(request) \
199199
if hasattr(model_admin, 'get_list_select_related') else model_admin.list_select_related
200200

201-
search_help_text = None
202-
203201
actions = model_admin.get_actions(request)
204202
if actions:
205203
list_display = ['action_checkbox'] + list(list_display)
206204

207205
ChangeList = model_admin.get_changelist(request)
208206

207+
search_help_text = model_admin.search_help_text
209208
change_list_args = [
210209
request, model, list_display, list_display_links, list_filter,
211210
model_admin.date_hierarchy, search_fields, list_select_related,

0 commit comments

Comments
 (0)