MID-5327 branch info on the About page

Evolveum · Oct 22, 2019 · 6bb6406 · 6bb6406
1 parent 65403be
commit 6bb6406
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
@@ -30,16 +30,32 @@ <h3 class="box-title"><wicket:message key="PageAbout.title.basic"/></h3>
                         <div class="box-body no-padding">
                             <table class="table table-striped table-word-break">
                                 <tr>
-                                    <td class="col-xs-3"><wicket:message key="PageAbout.midPointVersionTitle" /></td>
-                                    <td class="col-xs-9"><wicket:message key="midpoint.system.version" /></td>
+                                    <td class="col-xs-3">
+                                        <wicket:message key="PageAbout.midPointVersionTitle"/>
+                                    </td>
+                                    <td class="col-xs-9">
+                                        <wicket:message key="midpoint.system.version"/>
+                                    </td>
                                 </tr>
                                 <tr>
-                                    <td><wicket:message key="PageAbout.midPointRevisionTitle" /></td>
-                                    <td><span wicket:id="build" /></td>
+                                    <td class="col-xs-3">
+                                        <wicket:message key="PageAbout.midPointBranch"/>
+                                    </td>
+                                    <td class="col-xs-9">
+                                        <span wicket:id="branch"/>
+                                    </td>
                                 </tr>
                                 <tr>
-                                    <td><wicket:message key="PageAbout.builtAt" /></td>
-                                    <td><span wicket:id="buildTimestamp" /></td>
+                                    <td>
+                                        <wicket:message key="PageAbout.midPointRevisionTitle"/>
+                                    </td>
+                                    <td><span wicket:id="build"/></td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <wicket:message key="PageAbout.builtAt"/>
+                                    </td>
+                                    <td><span wicket:id="buildTimestamp"/></td>
                                 </tr>
                             </table>
                         </div>

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
@@ -91,6 +91,7 @@ public class PageAbout extends PageAdminConfiguration {
 
     private static final String ID_BUILD_TIMESTAMP = "buildTimestamp";
     private static final String ID_BUILD = "build";
+    private static final String ID_BRANCH = "branch";
     private static final String ID_PROPERTY = "property";
     private static final String ID_VALUE = "value";
     private static final String ID_LIST_SYSTEM_ITEMS = "listSystemItems";
@@ -144,6 +145,10 @@ protected ProvisioningDiag load() {
     }
 
     private void initLayout() {
+        Label branch = new Label(ID_BRANCH, createStringResource("midpoint.system.branch"));
+        branch.setRenderBodyOnly(true);
+        add(branch);
+
         Label revision = new Label(ID_BUILD, createStringResource("midpoint.system.build"));
         revision.setRenderBodyOnly(true);
         add(revision);