Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

display data source icon in query editor #4119

Merged
merged 10 commits into from
Sep 2, 2019
Merged

display data source icon in query editor #4119

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5d81488
Raise the upper limit of MAX_JSON_SIZE
swfz Jan 20, 2019
899baa8
move constant value to clientConfig
swfz Feb 11, 2019
215b25e
change name maxJsonSize to tableCellMaxJSONSize
swfz Feb 11, 2019
94b10f7
value from environment. default is 50000
swfz Feb 12, 2019
7af0f9a
Merge branch 'master' into master
kravets-levko Feb 13, 2019
0c9439d
Merge remote-tracking branch 'upstream/master'
swfz Feb 14, 2019
2147c79
Merge branch 'master' of github.com:swfz/redash
swfz Feb 14, 2019
897e4b9
Merge remote-tracking branch 'upstream/master'
swfz Aug 7, 2019
72b8f44
Merge remote-tracking branch 'remotes/upstream/master'
swfz Sep 2, 2019
7570ae8
display data source icon in query editor
swfz Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions client/app/pages/queries/query.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,12 @@ <h3>
<div class="editor__left__data-source">
<ui-select ng-model="query.data_source_id" remove-selected="false" ng-disabled="!isQueryOwner || !sourceMode"
on-select="updateDataSource()" data-test="SelectDataSource">
<ui-select-match placeholder="Select Data Source...">{{$select.selected.name}}</ui-select-match>
<ui-select-match placeholder="Select Data Source..." class="align-items-center">
<img src="/static/images/db-logos/{{$select.selected.type}}.png" width="20" height="20" style="vertical-align: top">
{{$select.selected.name}}
</ui-select-match>
<ui-select-choices repeat="ds.id as ds in dataSources | filter:$select.search">
{{ds.name}}
<img src="/static/images/db-logos/{{ds.type}}.png" width="20" height="20" class="m-r-5">{{ds.name}}
</ui-select-choices>
</ui-select>
</div>
Expand Down