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

Merge 2.3 into master #4524

Merged
merged 6 commits into from
Jan 17, 2019
Merged

Merge 2.3 into master #4524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06464a1
Don't display the message if redirect URL is empty
sbrunner Jan 11, 2019
6a0665e
Merge pull request #4516 from camptocamp/fix-redirect
sbrunner Jan 11, 2019
76e98fb
Use the OnlineResource from the WMS if the url is not provided
fredj Jan 16, 2019
053d12c
Use OnlineResource by default
sbrunner Jan 17, 2019
b13a062
Merge pull request #4522 from camptocamp/GSGMF-755
fredj Jan 17, 2019
c561925
Merge remote-tracking branch 'origin/2.3'
fredj Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion contribs/gmf/apps/mobile/index.html.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
></ngeo-displaywindow>
<div class="gmf-app-map-messages">
<gmf-disclaimer gmf-disclaimer-map="::mainCtrl.map"></gmf-disclaimer>
<div class="alert alert-info alert-dismissible fade in hidden-xs" role="alert">
<div class="alert alert-info alert-dismissible fade in hidden-xs" role="alert" ng-if="::mainCtrl.redirectUrl !== ''">
<button type="button" class="close" data-dismiss="alert" aria-label="{{'Close' | translate }}"><span aria-hidden="true" class="fa fa-times"></span></button>
<span translate
translate-params-url="::mainCtrl.redirectUrl">
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/apps/mobile_alt/index.html.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
></ngeo-displaywindow>
<div class="gmf-app-map-messages">
<gmf-disclaimer gmf-disclaimer-map="::mainCtrl.map"></gmf-disclaimer>
<div class="alert alert-info alert-dismissible fade in hidden-xs" role="alert">
<div class="alert alert-info alert-dismissible fade in hidden-xs" role="alert" ng-if="::mainCtrl.redirectUrl !== ''">
<button type="button" class="close" data-dismiss="alert" aria-label="{{'Close' | translate }}"><span aria-hidden="true" class="fa fa-times"></span></button>
<span translate
translate-params-url="::mainCtrl.redirectUrl">
Expand Down
2 changes: 2 additions & 0 deletions contribs/gmf/src/datasource/ExternalDataSourcesManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,8 @@ const exports = class {
const id = exports.getId(layer);
const service = capabilities['Service'];

url = service['OnlineResource'] || url;

let dataSource;

// (1) Get data source from cache if it exists, otherwise create it
Expand Down