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

Fix for FN's bærekraftsmål missing #1064

Merged
merged 7 commits into from
Mar 29, 2023
Merged

Fix for FN's bærekraftsmål missing #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3656fb1
Fix for FNs bærekraftsmål #1058
tarjeieo Mar 28, 2023
ee955b0
Prefixed bærekraftsmål with 0 to support sorting
tarjeieo Mar 28, 2023
6adaef7
Moved simple nav update
tarjeieo Mar 28, 2023
4537190
Fixed FN termset sort order to allow sorting
tarjeieo Mar 28, 2023
49fbcf5
Formatting fix
tarjeieo Mar 28, 2023
11f1717
Merge branch 'releases/1.8' into issues/1058
tarjeieo Mar 29, 2023
498e9ba
Merge branch 'releases/1.8' into issues/1058
olemp Mar 29, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Sjekk ut [release notes](./releasenotes/1.8.0.md) for høydepunkter og mer detal
- Fikset et problem hvor kommandolinje ikke ble vist som standard [#1042](https://github.com/Puzzlepart/prosjektportalen365/issues/1042)
- Fikset et problem som noen gang oppstod under kopering av fasesjekkliste-elementer med valgt fase [#1052](https://github.com/Puzzlepart/prosjektportalen365/issues/1052)
- Fikset problem hvor det ikke var mulig å synkronisere data fra 'Prosjektdata' listen (Idebehandling)
- Fikset manglende termset for FNs bærekraftsmål [#1058](https://github.com/Puzzlepart/prosjektportalen365/issues/1058)

## 1.8.0 - 28.02.2023

Expand Down
3 changes: 1 addition & 2 deletions Install/Install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,13 @@ if (-not $SkipDefaultSiteDesignAssociation.IsPresent) {

#region Running pre-install upgrade steps
if ($Upgrade.IsPresent) {
StartAction("Running pre-install upgrade steps")
Write-Host "[INFO] Running pre-install upgrade steps"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hvorfor fjerne bruk av StartAction og EndAction?

Copy link
Member Author

@tarjeieo tarjeieo Mar 29, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Rett og slett fordi skriptet som kjører mellom også skriver til host, så det ble ganske rar formatering mtp manglende newline i startaction outputen.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ait, det ødelegger stopwatch-bruken, men greit..

try {
Connect-SharePoint -Url $Uri.AbsoluteUri -ErrorAction Stop
."$PSScriptRoot\Scripts\PreInstallUpgrade.ps1"
Disconnect-PnPOnline
}
Catch {}
EndAction
}
#endregion

Expand Down
6 changes: 1 addition & 5 deletions Install/Scripts/PostInstallUpgrade.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ if ($null -ne $LastInstall) {
Write-Host "[INFO] In version v1.2.7 we added 'Prosjekttidslinje' to the top navigation. Adding this navigation item now as part of the upgrade"
Add-PnPNavigationNode -Location TopNavigationBar -Title "Prosjekttidslinje" -Url "$($Uri.LocalPath)/SitePages/Prosjekttidslinje.aspx"
}
if ($PreviousVersion -lt "1.5.0") {
Write-Host "[INFO] Applying PnP upgrade template [1.5.0] to [$Url]"
Invoke-PnPSiteTemplate -Path "$BasePath\1.5.0.pnp" -ErrorAction Stop
Write-Host "[SUCCESS] Successfully applied PnP template [1.5.0] to [$Url]" -ForegroundColor Green
}

if ($PreviousVersion -lt "1.6.0") {
Write-Host "[INFO] In version v1.6.0 we added Project timeline configuration and reworked the TimelineContent list. Merging data now as part of the upgrade"

Expand Down
12 changes: 12 additions & 0 deletions Install/Scripts/PreInstallUpgrade.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ if ($null -ne $LastInstall) {
}
}

if ($PreviousVersion -lt "1.5.0") {
Write-Host "[INFO] Applying PnP upgrade template [1.5.0] to [$Url]"
Invoke-PnPSiteTemplate -Path "$BasePath\1.5.0.pnp" -ErrorAction Stop
Write-Host "[SUCCESS] Successfully applied PnP template [1.5.0] to [$Url]" -ForegroundColor Green
}

if ($PreviousVersion -lt "1.7.0") {
$PnPClientSidePages = @(
"Gevinstoversikt.aspx",
Expand Down Expand Up @@ -60,4 +66,10 @@ if ($null -ne $LastInstall) {
Write-Host "[SUCCESS] 'Bygg & Anlegg' contenttypes re-named"
}
}

if ($PreviousVersion -lt "1.8.1") {
Write-Host "[INFO] Applying PnP upgrade template [1.8.1] to [$Url]"
Invoke-PnPSiteTemplate -Path "$BasePath\1.8.1.pnp" -ErrorAction Stop
Write-Host "[SUCCESS] Successfully applied PnP template [1.8.1] to [$Url]" -ForegroundColor Green
}
}
18 changes: 9 additions & 9 deletions Templates/Taxonomy/Taxonomy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,47 +207,47 @@
</pnp:TermSet>
<pnp:TermSet Name="FNs bærekraftsmål" ID="abdc8d0f-cf79-4d49-82e2-d94d9122ad65" Description=" ">
<pnp:Terms>
<pnp:Term Name="1. Utrydde fattigdom" ID="28a1d80e-6201-4f90-9a0a-6755645497b6" SourceTermId="28a1d80e-6201-4f90-9a0a-6755645497b6">
<pnp:Term Name="01. Utrydde fattigdom" ID="28a1d80e-6201-4f90-9a0a-6755645497b6" SourceTermId="28a1d80e-6201-4f90-9a0a-6755645497b6">
<pnp:Labels>
<pnp:Label Language="1033" Value="1. Utrydde fattigdom" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="2. Utrydde sult" ID="076fd5e4-41e4-469b-b0a5-47685141c121" SourceTermId="076fd5e4-41e4-469b-b0a5-47685141c121">
<pnp:Term Name="02. Utrydde sult" ID="076fd5e4-41e4-469b-b0a5-47685141c121" SourceTermId="076fd5e4-41e4-469b-b0a5-47685141c121">
<pnp:Labels>
<pnp:Label Language="1033" Value="2. Utrydde sult" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="3. God helse og livskvalitet" ID="4702f85b-9771-4f9d-86ea-f2266caa85ff" SourceTermId="4702f85b-9771-4f9d-86ea-f2266caa85ff">
<pnp:Term Name="03. God helse og livskvalitet" ID="4702f85b-9771-4f9d-86ea-f2266caa85ff" SourceTermId="4702f85b-9771-4f9d-86ea-f2266caa85ff">
<pnp:Labels>
<pnp:Label Language="1033" Value="3. God helse og livskvalitet" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="4. God utdanning" ID="2d26b638-cfbc-4e1b-81e7-f3bdce5cd250" SourceTermId="2d26b638-cfbc-4e1b-81e7-f3bdce5cd250">
<pnp:Term Name="04. God utdanning" ID="2d26b638-cfbc-4e1b-81e7-f3bdce5cd250" SourceTermId="2d26b638-cfbc-4e1b-81e7-f3bdce5cd250">
<pnp:Labels>
<pnp:Label Language="1033" Value="4. God utdanning" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="5. Likestilling mellom kjønnene" ID="93056cee-ab7a-469e-8471-6cb11d1c43bf" SourceTermId="93056cee-ab7a-469e-8471-6cb11d1c43bf">
<pnp:Term Name="05. Likestilling mellom kjønnene" ID="93056cee-ab7a-469e-8471-6cb11d1c43bf" SourceTermId="93056cee-ab7a-469e-8471-6cb11d1c43bf">
<pnp:Labels>
<pnp:Label Language="1033" Value="5. Likestilling mellom kjønnene" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="6. Rent vann og gode sanitærforhold" ID="98d317a2-87be-4252-990c-a65043545efb" SourceTermId="98d317a2-87be-4252-990c-a65043545efb">
<pnp:Term Name="06. Rent vann og gode sanitærforhold" ID="98d317a2-87be-4252-990c-a65043545efb" SourceTermId="98d317a2-87be-4252-990c-a65043545efb">
<pnp:Labels>
<pnp:Label Language="1033" Value="6. Rent vann og gode sanitærforhold" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="7. Ren energi til alle" ID="13b4f253-121a-446b-ba52-ad416c1f9a7b" SourceTermId="13b4f253-121a-446b-ba52-ad416c1f9a7b">
<pnp:Term Name="07. Ren energi til alle" ID="13b4f253-121a-446b-ba52-ad416c1f9a7b" SourceTermId="13b4f253-121a-446b-ba52-ad416c1f9a7b">
<pnp:Labels>
<pnp:Label Language="1033" Value="7. Ren energi til alle" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="8. Anstendig arbeid og økonomisk vekst" ID="e2d49957-72f3-40b4-8f65-0ee1acd06a42" SourceTermId="e2d49957-72f3-40b4-8f65-0ee1acd06a42">
<pnp:Term Name="08. Anstendig arbeid og økonomisk vekst" ID="e2d49957-72f3-40b4-8f65-0ee1acd06a42" SourceTermId="e2d49957-72f3-40b4-8f65-0ee1acd06a42">
<pnp:Labels>
<pnp:Label Language="1033" Value="8. Anstendig arbeid og økonomisk vekst" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="9. Industri, innovasjon og infrastruktur" ID="21a4505c-d2d6-4071-8116-f5b1a57903b7" SourceTermId="21a4505c-d2d6-4071-8116-f5b1a57903b7">
<pnp:Term Name="09. Industri, innovasjon og infrastruktur" ID="21a4505c-d2d6-4071-8116-f5b1a57903b7" SourceTermId="21a4505c-d2d6-4071-8116-f5b1a57903b7">
<pnp:Labels>
<pnp:Label Language="1033" Value="9. Industri, innovasjon og infrastruktur" IsDefaultForLanguage="true" />
</pnp:Labels>
Expand Down
103 changes: 103 additions & 0 deletions Templates/Upgrade/1.8.1/1.8.1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<?xml version="1.0"?>
<pnp:Provisioning xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<pnp:Preferences></pnp:Preferences>
<pnp:Templates ID="CONTAINER-PP">
<pnp:ProvisioningTemplate ID="TEMPLATE-PP-TAXONOMY-1.8.1" Version="0">
<pnp:TermGroups>
<pnp:TermGroup Name="Prosjektportalen" ID="c56bb677-f782-4cf6-a6d6-17685ee9f19d" Description=" ">
<pnp:TermSets>
<pnp:TermSet Name="FNs bærekraftsmål" ID="abdc8d0f-cf79-4d49-82e2-d94d9122ad65" Description=" ">
<pnp:Terms>
<pnp:Term Name="01. Utrydde fattigdom" ID="28a1d80e-6201-4f90-9a0a-6755645497b6" SourceTermId="28a1d80e-6201-4f90-9a0a-6755645497b6">
<pnp:Labels>
<pnp:Label Language="1033" Value="1. Utrydde fattigdom" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="02. Utrydde sult" ID="076fd5e4-41e4-469b-b0a5-47685141c121" SourceTermId="076fd5e4-41e4-469b-b0a5-47685141c121">
<pnp:Labels>
<pnp:Label Language="1033" Value="2. Utrydde sult" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="03. God helse og livskvalitet" ID="4702f85b-9771-4f9d-86ea-f2266caa85ff" SourceTermId="4702f85b-9771-4f9d-86ea-f2266caa85ff">
<pnp:Labels>
<pnp:Label Language="1033" Value="3. God helse og livskvalitet" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="04. God utdanning" ID="2d26b638-cfbc-4e1b-81e7-f3bdce5cd250" SourceTermId="2d26b638-cfbc-4e1b-81e7-f3bdce5cd250">
<pnp:Labels>
<pnp:Label Language="1033" Value="4. God utdanning" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="05. Likestilling mellom kjønnene" ID="93056cee-ab7a-469e-8471-6cb11d1c43bf" SourceTermId="93056cee-ab7a-469e-8471-6cb11d1c43bf">
<pnp:Labels>
<pnp:Label Language="1033" Value="5. Likestilling mellom kjønnene" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="06. Rent vann og gode sanitærforhold" ID="98d317a2-87be-4252-990c-a65043545efb" SourceTermId="98d317a2-87be-4252-990c-a65043545efb">
<pnp:Labels>
<pnp:Label Language="1033" Value="6. Rent vann og gode sanitærforhold" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="07. Ren energi til alle" ID="13b4f253-121a-446b-ba52-ad416c1f9a7b" SourceTermId="13b4f253-121a-446b-ba52-ad416c1f9a7b">
<pnp:Labels>
<pnp:Label Language="1033" Value="7. Ren energi til alle" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="08. Anstendig arbeid og økonomisk vekst" ID="e2d49957-72f3-40b4-8f65-0ee1acd06a42" SourceTermId="e2d49957-72f3-40b4-8f65-0ee1acd06a42">
<pnp:Labels>
<pnp:Label Language="1033" Value="8. Anstendig arbeid og økonomisk vekst" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="09. Industri, innovasjon og infrastruktur" ID="21a4505c-d2d6-4071-8116-f5b1a57903b7" SourceTermId="21a4505c-d2d6-4071-8116-f5b1a57903b7">
<pnp:Labels>
<pnp:Label Language="1033" Value="9. Industri, innovasjon og infrastruktur" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="10. Mindre ulikhet" ID="393752ef-df63-453c-9525-d713a619f547" SourceTermId="393752ef-df63-453c-9525-d713a619f547">
<pnp:Labels>
<pnp:Label Language="1033" Value="10. Mindre ulikhet" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="11. Bærekraftige byer og lokalsamfunn" ID="c931c5ee-283f-4dc6-8613-8ff003d13c8c" SourceTermId="c931c5ee-283f-4dc6-8613-8ff003d13c8c">
<pnp:Labels>
<pnp:Label Language="1033" Value="11. Bærekraftige byer og lokalsamfunn" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="12. Ansvarlig forbruk og produksjon" ID="f41654e0-da21-4dc3-b6d5-8bc88890c86d" SourceTermId="f41654e0-da21-4dc3-b6d5-8bc88890c86d">
<pnp:Labels>
<pnp:Label Language="1033" Value="12. Ansvarlig forbruk og produksjon" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="13. Stoppe klimaendringene" ID="70c2f6dc-93e6-4dec-9fe2-72d71d3cf6bf" SourceTermId="70c2f6dc-93e6-4dec-9fe2-72d71d3cf6bf">
<pnp:Labels>
<pnp:Label Language="1033" Value="13. Stoppe klimaendringene" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="14. Livet i havet" ID="dedfa330-748f-44ab-9f24-dad8ba1db6fe" SourceTermId="dedfa330-748f-44ab-9f24-dad8ba1db6fe">
<pnp:Labels>
<pnp:Label Language="1033" Value="14. Livet i havet" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="15. Livet på land" ID="c799311e-9e63-46a0-bff7-c1cf237713ce" SourceTermId="c799311e-9e63-46a0-bff7-c1cf237713ce">
<pnp:Labels>
<pnp:Label Language="1033" Value="15. Livet på land" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="16. Fred, rettferdighet og velfungerende institusjoner" ID="e356fd9f-289a-4e40-a0cb-21205f238185" SourceTermId="e356fd9f-289a-4e40-a0cb-21205f238185">
<pnp:Labels>
<pnp:Label Language="1033" Value="16. Fred, rettferdighet og velfungerende institusjoner" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
<pnp:Term Name="17. Samarbeid for å nå målene" ID="1e8be560-6d63-4d88-ae15-f493fad39347" SourceTermId="1e8be560-6d63-4d88-ae15-f493fad39347">
<pnp:Labels>
<pnp:Label Language="1033" Value="17. Samarbeid for å nå målene" IsDefaultForLanguage="true" />
</pnp:Labels>
</pnp:Term>
</pnp:Terms>
</pnp:TermSet>
</pnp:TermSets>
</pnp:TermGroup>
</pnp:TermGroups>
</pnp:ProvisioningTemplate>
</pnp:Templates>
</pnp:Provisioning>