diff options
| author | Grégoire Aubert <gregoire.aubert@sonarsource.com> | 2017-05-05 17:12:47 +0200 |
|---|---|---|
| committer | Grégoire Aubert <gregoire.aubert@sonarsource.com> | 2017-05-09 11:15:45 +0200 |
| commit | 3761e7dec9a22892c27863bb64e39d4d99cb9a48 (patch) | |
| tree | 07052f3f2f575fd033a622bbba5172a54fa47fda /server/sonar-web/src/main/js | |
| parent | b7b828b3482f25c906e2b77754e2a302d45d3bbf (diff) | |
| download | sonarqube-3761e7dec9a22892c27863bb64e39d4d99cb9a48.tar.gz sonarqube-3761e7dec9a22892c27863bb64e39d4d99cb9a48.zip | |
SONAR-8718 Allow HTML for WS domain description
Diffstat (limited to 'server/sonar-web/src/main/js')
| -rw-r--r-- | server/sonar-web/src/main/js/apps/web-api/components/Domain.js | 6 | ||||
| -rw-r--r-- | server/sonar-web/src/main/js/apps/web-api/components/Menu.js | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/server/sonar-web/src/main/js/apps/web-api/components/Domain.js b/server/sonar-web/src/main/js/apps/web-api/components/Domain.js index 45513d9f9e7..0c79d15d6b8 100644 --- a/server/sonar-web/src/main/js/apps/web-api/components/Domain.js +++ b/server/sonar-web/src/main/js/apps/web-api/components/Domain.js @@ -57,7 +57,11 @@ export default class Domain extends React.PureComponent { </span>} </header> - {domain.description && <p className="web-api-domain-description">{domain.description}</p>} + {domain.description && + <div + className="web-api-domain-description markdown" + dangerouslySetInnerHTML={{ __html: domain.description }} + />} <div className="web-api-domain-actions"> {filteredActions.map(action => ( diff --git a/server/sonar-web/src/main/js/apps/web-api/components/Menu.js b/server/sonar-web/src/main/js/apps/web-api/components/Menu.js index 566533c79c7..815cb1d4077 100644 --- a/server/sonar-web/src/main/js/apps/web-api/components/Menu.js +++ b/server/sonar-web/src/main/js/apps/web-api/components/Menu.js @@ -65,9 +65,11 @@ export default class Menu extends React.PureComponent { {domain.deprecated && <DeprecatedBadge />} {domain.internal && <InternalBadge />} </h3> - <p className="list-group-item-text"> - {domain.description} - </p> + {domain.description && + <div + className="list-group-item-text markdown" + dangerouslySetInnerHTML={{ __html: domain.description }} + />} </Link> ))} </div> |