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

feat: [CO-459] add new white-label management attributes #128

Merged
merged 4 commits into from
Nov 29, 2022
Merged

feat: [CO-459] add new white-label management attributes #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97a85b0
feat: add primary color attributes for domain entries
keshavbhatt Nov 25, 2022
cc5856e
chore: add attribute for Web Ui banner text
keshavbhatt Nov 28, 2022
0daa0e3
feat: run generate-getters in store
keshavbhatt Nov 28, 2022
8d48934
feat: run generate-rights in store
keshavbhatt Nov 28, 2022
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
32 changes: 32 additions & 0 deletions common/src/java/com/zimbra/common/account/ZAttrProvisioning.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2692,6 +2692,14 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
@ZAttr(id=3113)
public static final String A_carbonioAdminUiTitle = "carbonioAdminUiTitle";

/**
* Admin Web UI Banner Text preference for domain
*
* @since ZCS 23.1.0
*/
@ZAttr(id=3119)
public static final String A_carbonioAdminWebUiBannerText = "carbonioAdminWebUiBannerText";

/**
* Whether Carbonio can take interactive feedback from users
*
Expand Down Expand Up @@ -2748,6 +2756,14 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
@ZAttr(id=3101)
public static final String A_carbonioWebUiAppLogo = "carbonioWebUiAppLogo";

/**
* Web UI Banner Text preference for domain
*
* @since ZCS 23.1.0
*/
@ZAttr(id=3118)
public static final String A_carbonioWebUiBannerText = "carbonioWebUiBannerText";

/**
* Web UI Dark App Logo preference for domain
*
Expand Down Expand Up @@ -2780,6 +2796,14 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
@ZAttr(id=3096)
public static final String A_carbonioWebUiDarkMode = "carbonioWebUiDarkMode";

/**
* Web UI Dark Mode Primary Color preference for domain
*
* @since ZCS 23.1.0
*/
@ZAttr(id=3117)
public static final String A_carbonioWebUiDarkPrimaryColor = "carbonioWebUiDarkPrimaryColor";

/**
* Web UI Description preference for domain
*
Expand Down Expand Up @@ -2812,6 +2836,14 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
@ZAttr(id=3097)
public static final String A_carbonioWebUiLoginLogo = "carbonioWebUiLoginLogo";

/**
* Web UI Primary Color preference for domain
*
* @since ZCS 23.1.0
*/
@ZAttr(id=3116)
public static final String A_carbonioWebUiPrimaryColor = "carbonioWebUiPrimaryColor";

/**
* Web UI Title preference for domain
*
Expand Down
2 changes: 1 addition & 1 deletion store-conf/conf/msgs/ZsMsgRights.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
#
# DO NOT MODIFY - generated by RightManager
# 22.11.0_ZEXTRAS_202211 carbonio 20221027-1138 FOSS
# 23.1.0_ZEXTRAS_202301 carbonio 20221128-1904 FOSS
#
#
# Zimbra rights
Expand Down
28 changes: 16 additions & 12 deletions store-conf/conf/rights/rights-domainadmin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>


<!--
<!--
========================================================
current domain admin rights
========================================================
Expand All @@ -11,11 +11,11 @@

<include file="rights.xml"/>

<!--
<!--
========================================================
domain admin modifiable attrs, the template
domain admin modifiable attrs, the template
if filled by:

ZimbraServer> ant generate-domainadmin-rights-xml
========================================================
-->
Expand Down Expand Up @@ -437,7 +437,7 @@

<right name="setDomainAdminCalendarResourceAttrs" type="setAttrs" targetType="calresource">
<desc>calendar resource attrs modifiable by domain admins for domain based access manager</desc>
<attrs>
<attrs>
<a n="zimbraCalResAutoAcceptDecline"/>
<a n="zimbraCalResAutoDeclineIfBusy"/>
<a n="zimbraCalResAutoDeclineRecurring"/>
Expand All @@ -459,7 +459,7 @@

<right name="setDomainAdminDistributionListAttrs" type="setAttrs" targetType="dl">
<desc>distribution list attrs modifiable by domain admins for domain based access manager</desc>
<attrs>
<attrs>
<a n="cn"/>
<a n="description"/>
<a n="displayName"/>
Expand All @@ -480,7 +480,7 @@
<right name="setDomainAdminDomainAttrs" type="setAttrs" targetType="domain">
<desc>domain attrs modifiable by domain admins for domain based access manager</desc>
<attrs>
<a n="zimbraDomainDefaultCOSId"/>
<a n="zimbraDomainDefaultCOSId"/>
<a n="carbonioAdminUiAppLogo"/>
<a n="carbonioAdminUiBackground"/>
<a n="carbonioAdminUiDarkAppLogo"/>
Expand All @@ -490,15 +490,19 @@
<a n="carbonioAdminUiFavicon"/>
<a n="carbonioAdminUiLoginLogo"/>
<a n="carbonioAdminUiTitle"/>
<a n="carbonioAdminWebUiBannerText"/>
<a n="carbonioWebUiAppLogo"/>
<a n="carbonioWebUiBannerText"/>
<a n="carbonioWebUiDarkAppLogo"/>
<a n="carbonioWebUiDarkLoginBackground"/>
<a n="carbonioWebUiDarkLoginLogo"/>
<a n="carbonioWebUiDarkMode"/>
<a n="carbonioWebUiDarkPrimaryColor"/>
<a n="carbonioWebUiDescription"/>
<a n="carbonioWebUiFavicon"/>
<a n="carbonioWebUiLoginBackground"/>
<a n="carbonioWebUiLoginLogo"/>
<a n="carbonioWebUiPrimaryColor"/>
<a n="carbonioWebUiTitle"/>
<a n="description"/>
<a n="zimbraAdminConsoleLoginURL"/>
Expand Down Expand Up @@ -655,7 +659,7 @@
<r n="listAccount"/>
<r n="listAlias"/>
<r n="listCalendarResource"/>
<r n="listDistributionList"/>
<r n="listDistributionList"/>
<r n="setDomainAdminDomainAttrs"/>
</rights>
</right>
Expand All @@ -672,7 +676,7 @@
<r n="listZimlet"/>
</rights>
</right>

<!--
=========================================================
end generated
Expand All @@ -692,11 +696,11 @@
<r n="domainAdminCalendarResourceRights"/>
<r n="domainAdminDistributionListRights"/>
<r n="domainAdminDomainRights"/>

<!-- not generated, put here manually -->
<r n="listAlias"/>
</rights>
</right>



</rights>
</rights>
16 changes: 16 additions & 0 deletions store/conf/attrs/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9932,4 +9932,20 @@ TODO: delete them permanently from here
<defaultCOSValue>FALSE</defaultCOSValue>
<desc>Web UI Dark Mode preference for account</desc>
</attr>

<attr id="3116" name="carbonioWebUiPrimaryColor" type="string" cardinality="single" optionalIn="globalConfig,domain" flags="domainInherited,domainInfo,domainAdminModifiable" since="23.1.0">
<desc>Web UI Primary Color preference for domain</desc>
</attr>

<attr id="3117" name="carbonioWebUiDarkPrimaryColor" type="string" cardinality="single" optionalIn="globalConfig,domain" flags="domainInherited,domainInfo,domainAdminModifiable" since="23.1.0">
<desc>Web UI Dark Mode Primary Color preference for domain</desc>
</attr>

<attr id="3118" name="carbonioWebUiBannerText" type="string" cardinality="single" optionalIn="globalConfig,domain" flags="domainInherited,domainInfo,domainAdminModifiable" since="23.1.0">
<desc>Web UI Banner Text preference for domain</desc>
</attr>

<attr id="3119" name="carbonioAdminWebUiBannerText" type="string" cardinality="single" optionalIn="globalConfig,domain" flags="domainInherited,domainInfo,domainAdminModifiable" since="23.1.0">
<desc>Admin Web UI Banner Text preference for domain</desc>
</attr>
</attrs>
Loading