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

Only set hideByline if not already set #571

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Only set hideByline if not already set #571

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b03da5
Only set hideByline if not already set
gunnarvelle Jan 7, 2025
31470a0
Remove check for hidebyline
gunnarvelle Jan 8, 2025
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
19 changes: 11 additions & 8 deletions ...a/articleapi/db/migrationwithdependencies/V55__SetHideBylineForImagesNotCopyrighted.scala
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Ble disse aldri kjørt siden vi oppdaterer migreringer fremfor å lage nye?

Copy link
Member Author

Choose a reason for hiding this comment

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

Den er ikkje kjørt i prod endå. Skal kopiere data fra prod til staging for å verifisere.

Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ trait V55__SetHideBylineForImagesNotCopyrighted {
doc
.select("ndlaembed[data-resource='image']")
.forEach(embed => {
val noHideByline = !embed.hasAttr("data-hide-byline")
if (noHideByline) {
ids += embed.attr("data-resource_id")
}
ids += embed.attr("data-resource_id")
})
if (ids.result().isEmpty) {
return doc
Expand All @@ -31,10 +28,16 @@ trait V55__SetHideBylineForImagesNotCopyrighted {
doc
.select("ndlaembed[data-resource='image']")
.forEach(embed => {
val imageId = embed.attr("data-resource_id")
val image = images.find(i => i.id == imageId)
embed
.attr("data-hide-byline", s"${image.exists(i => !i.copyright.license.license.equals("COPYRIGHTED"))}"): Unit
val noHideByline = !embed.hasAttr("data-hide-byline")
Copy link
Contributor

Choose a reason for hiding this comment

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

Det ble aldri satt data-hide-byline=false?

Copy link
Member Author

Choose a reason for hiding this comment

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

Mulig, men tanken min var å droppe å sette dersom verdien allerede er satt.

if (noHideByline) {
val imageId = embed.attr("data-resource_id")
val image = images.find(i => i.id == imageId)
embed
.attr(
"data-hide-byline",
s"${image.exists(i => !i.copyright.license.license.equals("COPYRIGHTED"))}"
): Unit
}
})
doc
}
Expand Down
14 changes: 10 additions & 4 deletions ...dla/draftapi/db/migrationwithdependencies/V66__SetHideBylineForImagesNotCopyrighted.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,16 @@ trait V66__SetHideBylineForImagesNotCopyrighted {
doc
.select("ndlaembed[data-resource='image']")
.forEach(embed => {
val imageId = embed.attr("data-resource_id")
val image = images.find(i => i.id == imageId)
embed
.attr("data-hide-byline", s"${image.exists(i => !i.copyright.license.license.equals("COPYRIGHTED"))}"): Unit
val noHideByline = !embed.hasAttr("data-hide-byline")
if (noHideByline) {
val imageId = embed.attr("data-resource_id")
val image = images.find(i => i.id == imageId)
embed
.attr(
"data-hide-byline",
s"${image.exists(i => !i.copyright.license.license.equals("COPYRIGHTED"))}"
): Unit
}
})
doc
}
Expand Down
Loading