From c77289e05dbaec17653ddb7f739af06327782c8a Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 9 May 2017 10:50:30 +0200
Subject: [PATCH] SONAR-9165 hide tooltips on permissions page, update message

---
 .../apps/permission-templates/components/ListHeader.js |  2 +-
 .../apps/permission-templates/components/Template.js   |  1 +
 .../apps/permissions/shared/components/HoldersList.js  | 10 ++++++++--
 .../src/main/resources/org/sonar/l10n/core.properties  |  3 +--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.js b/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.js
index 7f6a6fae4db..327003ebb85 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.js
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.js
@@ -32,7 +32,7 @@ export default class ListHeader extends React.PureComponent {
       ? <div>
           {permission.description}
           <div className="alert alert-warning spacer-top">
-            {translate('projects_role', permission.key, 'public_projects_warning')}
+            {translate('projects_role.public_projects_warning')}
           </div>
         </div>
       : permission.description);
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Template.js b/server/sonar-web/src/main/js/apps/permission-templates/components/Template.js
index f924d2d31b7..5152cb22960 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/Template.js
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Template.js
@@ -206,6 +206,7 @@ export default class Template extends React.PureComponent {
           selectedPermission={this.state.selectedPermission}
           users={allUsers}
           groups={this.state.groups}
+          showPublicProjectsWarning={true}
           onSelectPermission={this.handleSelectPermission}
           onToggleUser={this.handleToggleUser}
           onToggleGroup={this.handleToggleGroup}>
diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.js b/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.js
index 4816241040a..d5c216d865d 100644
--- a/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.js
+++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.js
@@ -29,11 +29,16 @@ export default class HoldersList extends React.PureComponent {
     users: React.PropTypes.array.isRequired,
     groups: React.PropTypes.array.isRequired,
     selectedPermission: React.PropTypes.string,
+    showPublicProjectsWarning: React.PropTypes.bool,
     onSelectPermission: React.PropTypes.func.isRequired,
     onToggleUser: React.PropTypes.func.isRequired,
     onToggleGroup: React.PropTypes.func.isRequired
   };
 
+  static defaultProps = {
+    showPublicProjectsWarning: false
+  };
+
   handlePermissionClick = event => {
     event.preventDefault();
     event.currentTarget.blur();
@@ -41,11 +46,12 @@ export default class HoldersList extends React.PureComponent {
   };
 
   renderTooltip = permission =>
-    (permission.key === 'user' || permission.key === 'codeviewer'
+    (this.props.showPublicProjectsWarning &&
+      (permission.key === 'user' || permission.key === 'codeviewer')
       ? <div>
           {permission.description}
           <div className="alert alert-warning spacer-top">
-            {translate('projects_role', permission.key, 'public_projects_warning')}
+            {translate('projects_role.public_projects_warning')}
           </div>
         </div>
       : permission.description);
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 09ef00e5afe..d1e6ff744cf 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2426,10 +2426,8 @@ projects_role.issueadmin=Administer Issues
 projects_role.issueadmin.desc=Perform advanced editing on issues: marking an issue False Positive / Won't Fix, and changing an Issue's severity. (Users will also need "Browse" permission)
 projects_role.user=Browse
 projects_role.user.desc=Access a project, browse its measures, and create/edit issues for it.
-projects_role.user.public_projects_warning=This option is not editable for public projects. Anyone will still be able to browse even if you apply a template with this option unchecked.
 projects_role.codeviewer=See Source Code
 projects_role.codeviewer.desc=View the project's source code. (Users will also need "Browse" permission)
-projects_role.codeviewer.public_projects_warning=This option is not editable for public projects. Source code will will always be visible even if you apply a template with this option unchecked.
 projects_role.scan=Execute Analysis
 projects_role.scan.desc=Ability to get all settings required to perform an analysis (including the secured settings like passwords) and to push analysis results to the SonarQube server.
 projects_role.bulk_change=Bulk Change
@@ -2441,6 +2439,7 @@ projects_role.turn_x_to_public=Turn "{0}" to Public
 projects_role.turn_project_to_public=Turn Project to Public
 projects_role.are_you_sure_to_turn_project_to_public=Are you sure you want to turn your project to public?
 projects_role.are_you_sure_to_turn_project_to_public.2=Everybody will be able to browse and see the source code of your project.
+projects_role.public_projects_warning=This permission is always granted by default to everybody (anonymous or authenticated user) for public projects. Therefore, the selection made on this page will be applied to private projects only.
 
 
 
-- 
2.39.5