summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobertMassaioli <>2019-10-08 21:48:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2019-10-08 21:48:00 (GMT)
commitd43ea2bc147fd7ef110e85249e05246e6c6fd882 (patch)
treec7a730f4a90ef62c5476e9eb675206a27729b3b6
parent255175ac85e27900c9d64dee1a1cf20b10a47736 (diff)
version 0.4.10.0HEAD0.4.10.0master
-rwxr-xr-x[-rw-r--r--]README.markdown0
-rw-r--r--atlassian-connect-descriptor.cabal2
-rw-r--r--src/Data/Connect/Modules.hs13
-rw-r--r--tests/ModulesTest.hs1
4 files changed, 9 insertions, 7 deletions
diff --git a/README.markdown b/README.markdown
index 97387be..97387be 100644..100755
--- a/README.markdown
+++ b/README.markdown
diff --git a/atlassian-connect-descriptor.cabal b/atlassian-connect-descriptor.cabal
index 500beab..681f8ca 100644
--- a/atlassian-connect-descriptor.cabal
+++ b/atlassian-connect-descriptor.cabal
@@ -10,7 +10,7 @@ name: atlassian-connect-descriptor
-- PVP summary: +-+------- breaking API changes
-- | | +----- non-breaking API additions
-- | | | +--- code changes with no API change
-version: 0.4.9.0
+version: 0.4.10.0
-- A short (one-line) description of the package.
synopsis: Code that helps you create a valid Atlassian Connect Descriptor.
diff --git a/src/Data/Connect/Modules.hs b/src/Data/Connect/Modules.hs
index b8fd2f9..ba88112 100644
--- a/src/Data/Connect/Modules.hs
+++ b/src/Data/Connect/Modules.hs
@@ -419,12 +419,13 @@ instance ToJSON JIRAPage where
-- | This module adds a content button to the context area of the new Jira issue view.
-- Content can have an icon, tooltip, and target.
data JIRAIssueContent = JIRAIssueContent
- { jicKey :: T.Text -- ^ The add-on unique key for this module.
- , jicName :: I18nText -- ^ The name of this JIRA Issue Content.
- , jicTooltip :: I18nText -- ^ The tooltip for this JIRA Issue Content.
- , jicIcon :: IconDetails -- ^ The icon for this JIRA Issue Content.
- , jicTarget :: JIRAIssueContentTarget -- ^ Specifies the target action when clicking on the content.
- , jicConditions :: [Condition] -- ^ The conditions under which the content will be shown.
+ { jicKey :: T.Text -- ^ The add-on unique key for this module.
+ , jicName :: I18nText -- ^ The name of this JIRA Issue Content.
+ , jicTooltip :: I18nText -- ^ The tooltip for this JIRA Issue Content.
+ , jicIcon :: IconDetails -- ^ The icon for this JIRA Issue Content.
+ , jicTarget :: JIRAIssueContentTarget -- ^ Specifies the target action when clicking on the content.
+ , jicConditions :: [Condition] -- ^ The conditions under which the content could be shown.
+ , jicContentPresentConditions :: [Condition] -- ^ The conditions under which the content will always be shown.
} deriving (Show, Generic)
instance ToJSON JIRAIssueContent where
diff --git a/tests/ModulesTest.hs b/tests/ModulesTest.hs
index b44e28d..31bb501 100644
--- a/tests/ModulesTest.hs
+++ b/tests/ModulesTest.hs
@@ -57,6 +57,7 @@ testIssueContentCorrectFormat = TestCase $ do
}
, jicTarget = JIRAIssueContentTargetWebPanel "/panel_url"
, jicConditions = []
+ , jicContentPresentConditions = []
}
let jv = toJSON jic
isObject jv @? "Expected the issue glance to be an object"