Merge branch 'dev' into main

Puzzlepart · Apr 4, 2022 · 46c0740 · 46c0740
2 parents cf78bac + 71121b1
commit 46c0740
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/SharePointFramework/ProjectWebParts/src/components/ProjectInformation/index.tsx b/SharePointFramework/ProjectWebParts/src/components/ProjectInformation/index.tsx
@@ -156,7 +156,7 @@ export class ProjectInformation extends BaseWebPartComponent<
       !this.props.isSiteAdmin
     ]
     const transformToParentProject: ActionType = [
-      strings.CreateParentProjectLabelAction,
+      strings.CreateParentProjectLabel,
       () => {
         this.setState({ displayParentCreationModal: true })
       },
@@ -165,17 +165,17 @@ export class ProjectInformation extends BaseWebPartComponent<
       !this.props.isSiteAdmin
     ]
     const viewAllPropertiesAction: ActionType = [
-      strings.ViewAllPropertiesText,
+      strings.ViewAllPropertiesLabel,
       () => {
         this.setState({ showProjectPropertiesPanel: true })
       },
       'EntryView',
       false
     ]
     if (this.state.isParentProject) {
-      return [transformToParentProject, viewAllPropertiesAction]
+      return [administerChildrenAction, viewAllPropertiesAction]
     }
-    return [administerChildrenAction, viewAllPropertiesAction]
+    return [transformToParentProject, viewAllPropertiesAction]
   }
 
   private onDismissParentModal() {
@@ -260,7 +260,7 @@ export class ProjectInformation extends BaseWebPartComponent<
         this.props.webUrl,
         strings.ProjectPropertiesListName,
         this.state.data.templateParameters.ProjectContentTypeId ||
-          '0x0100805E9E4FEAAB4F0EABAB2600D30DB70C',
+        '0x0100805E9E4FEAAB4F0EABAB2600D30DB70C',
         { Title: this.props.webTitle }
       )
       if (!created) {

diff --git a/SharePointFramework/ProjectWebParts/src/loc/en-us.js b/SharePointFramework/ProjectWebParts/src/loc/en-us.js
@@ -21,7 +21,7 @@ define([], function () {
     CurrentPhaseViewNameFieldLabel: 'Current phase display name',
     DocumentsListName: 'Documents',
     EditPropertiesText: 'Edit properties',
-    ViewAllPropertiesText: 'View all properties',
+    ViewAllPropertiesLabel: 'View all properties',
     EditReportButtonText: 'Edit status',
     PublishReportButtonText: 'Publish',
     GetSnapshotButtonText: 'Open as snapshot',

diff --git a/SharePointFramework/ProjectWebParts/src/loc/mystrings.d.ts b/SharePointFramework/ProjectWebParts/src/loc/mystrings.d.ts
@@ -26,7 +26,7 @@ declare interface IProjectWebPartsStrings {
   CurrentPhaseViewNameFieldLabel: string;
   DocumentsListName: string;
   EditPropertiesText: string;
-  ViewAllPropertiesText: string;
+  ViewAllPropertiesLabel: string;
   EditReportButtonText: string;
   PublishReportButtonText: string;
   PublishedStatusReport: string;
@@ -145,7 +145,7 @@ declare interface IProjectWebPartsStrings {
   PhaseSitePageFoundDescription: string;
   PhaseSitePageNotFoundDescription: string;
   UseDynamicHomepageChangePhaseDescription: string;
-  CreateParentProjectLabelAction: string;
+  CreateParentProjectLabel: string;
   ChildProjectAdminLabel: string;
   AdminPageLinkLabel: string;
 }

diff --git a/SharePointFramework/ProjectWebParts/src/loc/nb-no.js b/SharePointFramework/ProjectWebParts/src/loc/nb-no.js
@@ -21,7 +21,7 @@ define([], function() {
         CurrentPhaseViewNameFieldLabel: 'Visningsnavn for gjeldende fase',
         DocumentsListName: 'Dokumenter',
         EditPropertiesText: 'Rediger egenskaper',
-        ViewAllPropertiesText: 'Vis alle egenskaper',
+        ViewAllPropertiesLabel: 'Vis alle egenskaper',
         EditReportButtonText: 'Rediger status',
         PublishReportButtonText: 'Publiser',
         GetSnapshotButtonText: 'Åpne som øyeblikksbilde',