Subscription message in the footer

Conflicts: gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
Evolveum · Jan 25, 2017 · 351f0e5 · 351f0e5
1 parent 88e5f3e
commit 351f0e5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
@@ -127,7 +127,7 @@
             <div class="pull-right hidden-xs" wicket:id="version">
                 <b><wicket:message key="PageTemplate.version"/></b> <wicket:message key="pageBase.midPointVersion"/>
             </div>
-            <wicket:message key="PageTemplate.copy"/>
+            <div wicket:id="subscriptionMessage"/>
         </footer>
     </div>
 

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -1141,6 +1141,7 @@ PageBase.button.update=Update
 PageBase.clearCssCache=Clear less/js cache
 pageBase.midPointVersion=${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=unknown
+PageBase.subscriptionMessage=Non-subscription.
 PageBulkAction.async=Asynchronous
 PageBulkAction.button.start=Start
 PageBulkAction.message.emptyString=Inserted bulk action is empty. Please provide non-empty script.

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -10563,7 +10563,7 @@
                         </xsd:annotation>
                     </xsd:element>
 
-                    <xsd:element name="deploymentInformation" type="tns:DeploymentInformationType" minOccurs="0" maxOccurs="unbounded">
+                    <xsd:element name="deploymentInformation" type="tns:DeploymentInformationType" minOccurs="0" maxOccurs="1">
                         <xsd:annotation>
                             <xsd:documentation>
                                 Information about midPoint deployment: subscription information, deployment name,

diff --git a/model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java b/model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
@@ -185,7 +185,9 @@ <F extends ObjectType> ModelContext<F> previewChanges(
      * values applicable for current user, therefore the authorization might be considered to be implicit in this case.
      */
     AdminGuiConfigurationType getAdminGuiConfiguration(Task task, OperationResult parentResult) throws ObjectNotFoundException, SchemaException;
-
+
+	DeploymentInformationType getDeploymentInformationConfiguration(OperationResult parentResult) throws ObjectNotFoundException, SchemaException;
+
 	AccessCertificationConfigurationType getCertificationConfiguration(OperationResult parentResult)
 			throws ObjectNotFoundException, SchemaException;
 

diff --git a/...rc/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java b/...rc/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
@@ -680,6 +680,15 @@ public AdminGuiConfigurationType getAdminGuiConfiguration(Task task, OperationRe
 		}
 	}
 
+	@Override
+	public DeploymentInformationType getDeploymentInformationConfiguration(OperationResult parentResult) throws ObjectNotFoundException, SchemaException {
+		PrismObject<SystemConfigurationType> systemConfiguration = systemObjectCache.getSystemConfiguration(parentResult);
+		if (systemConfiguration == null) {
+			return null;
+		}
+			return systemConfiguration.asObjectable().getDeploymentInformation();
+	}
+
 	@Override
 	public AccessCertificationConfigurationType getCertificationConfiguration(OperationResult parentResult) throws ObjectNotFoundException, SchemaException {
 		PrismObject<SystemConfigurationType> systemConfiguration = systemObjectCache.getSystemConfiguration(parentResult);