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

implement separate wfs title #57822

Merged
merged 1 commit into from
Jun 21, 2024
Merged

implement separate wfs title #57822

merged 1 commit into from
Jun 21, 2024

Conversation

jef-n
Copy link
Member

@jef-n jef-n commented Jun 21, 2024

implements #55317

@github-actions github-actions bot added this to the 3.40.0 milestone Jun 21, 2024
@elpaso elpaso added Feature Server Related to QGIS server labels Jun 21, 2024
elpaso
elpaso approved these changes Jun 21, 2024
View reviewed changes
python/PyQt6/core/auto_generated/qgsmaplayerserverproperties.sip.in Outdated

QString wfsTitle() const;
%Docstring
Returns the optional wfs title if set or the title of the layer used by
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Returns the optional wfs title if set or the title of the layer used by
Returns the optional WFS title if set or the title of the layer used by

python/core/auto_generated/qgsmaplayerserverproperties.sip.in Outdated

QString wfsTitle() const;
%Docstring
Returns the optional wfs title if set or the title of the layer used by
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Returns the optional wfs title if set or the title of the layer used by
Returns the optional WFS title if set or the title of the layer used by

src/core/qgsmaplayerserverproperties.h Outdated
@@ -343,6 +352,16 @@ class CORE_EXPORT QgsMapLayerServerProperties: public QgsServerMetadataUrlProper
*/
QString title() const { return mTitle; }

/**
* Returns the optional wfs title if set or the title of the layer used by
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Returns the optional wfs title if set or the title of the layer used by
* Returns the optional WFS title if set or the title of the layer used by

src/gui/vector/qgsvectorlayerproperties.cpp Outdated
@@ -834,6 +836,16 @@ void QgsVectorLayerProperties::apply()
mMetadataFilled = false;
mLayer->serverProperties()->setTitle( mLayerTitleLineEdit->text() );

if ( mLayerOptWfsTitleLineEdit->text() != "" && mLayerOptWfsTitleLineEdit->text() != mLayerTitleLineEdit->text() )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if ( mLayerOptWfsTitleLineEdit->text() != "" && mLayerOptWfsTitleLineEdit->text() != mLayerTitleLineEdit->text() )
if ( !mLayerOptWfsTitleLineEdit->isEmpty() && mLayerOptWfsTitleLineEdit->text() != mLayerTitleLineEdit->text() )

@jef-n jef-n enabled auto-merge (rebase) June 21, 2024 15:46
@github-actions GitHub Actions
Copy link

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit eb71fc4)

@jef-n jef-n merged commit ef9dbf6 into qgis:master Jun 21, 2024
30 checks passed
@jef-n jef-n deleted the alternate-wfs-title branch June 24, 2024 09:35
@zacharlie zacharlie added the Changelog Items that are queued to appear in the visual changelog - remove after harvesting label Sep 24, 2024
@qgis-bot
Copy link
Collaborator

@jef-n

This pull request has been tagged for the changelog.

  • The description will be harvested so please provide a "nearly-ready" text for the final changelog
  • If possible, add a nice illustration of the feature. Only the first one in the description will be harvested (GIF accepted as well)
  • If you can, it's better to give credits to your sponsor, see below for different formats.

You can edit the description.

Format available for credits
  • Funded by NAME
  • Funded by URL
  • Funded by NAME URL
  • Sponsored by NAME
  • Sponsored by URL
  • Sponsored by NAME URL

Thank you!

@zacharlie zacharlie added ChangelogHarvested This PR description has been harvested in the Changelog already. and removed Changelog Items that are queued to appear in the visual changelog - remove after harvesting labels Sep 24, 2024
@DelazJ DelazJ added the Needs Documentation When merging a labeled PR, an issue will be created in the Doc repo. label Oct 2, 2024
@qgis-bot
Copy link
Collaborator

qgis-bot commented Oct 2, 2024

@jef-n
This pull request has been tagged as requiring documentation.

A documentation ticket will be opened at https://github.com/qgis/QGIS-Documentation when this PR is merged.

Please update the description (not the comments) with helpful description and screenshot to help the work from documentors.
Also, any commit having [needs-doc] or [Needs Documentation] in will see its message pushed to the issue, so please be as verbose as you can.

Thank you!

@qgis-bot
Copy link
Collaborator

qgis-bot commented Oct 2, 2024

@jef-n
A documentation ticket has been opened at qgis/QGIS-Documentation#9290
It is your responsibility to visit this ticket and add as much detail as possible for the documentation team to correctly document this change.
Thank you!

@qgis-bot qgis-bot mentioned this pull request Oct 2, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elpaso elpaso elpaso approved these changes

Assignees
No one assigned
Labels
ChangelogHarvested This PR description has been harvested in the Changelog already. Feature Needs Documentation When merging a labeled PR, an issue will be created in the Doc repo. Server Related to QGIS server
Projects
None yet
Milestone
3.40.0
Development

Successfully merging this pull request may close these issues.
5 participants
@jef-n @qgis-bot @elpaso @DelazJ @zacharlie