From 74da1cd5bc0015312814e8a560de4db57c33f737 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Thu, 29 Dec 2011 11:17:55 +0100
Subject: [PATCH] Add configuration option to disable warning about new
 LibrePlan versions

FEA: ItEr76S10NewVersionsNotification
---
 .../business/common/entities/Configuration.java     | 11 +++++++++++
 .../src/main/resources/db.changelog-1.2.xml         | 13 +++++++++++++
 .../business/common/entities/Configuration.hbm.xml  |  2 ++
 .../web/common/ConfigurationController.java         |  8 ++++++++
 .../libreplan/web/common/ConfigurationModel.java    | 10 ++++++++++
 .../libreplan/web/common/IConfigurationModel.java   |  4 ++++
 .../org/libreplan/web/common/ITemplateModel.java    |  2 ++
 .../libreplan/web/common/TemplateController.java    |  4 ++++
 .../org/libreplan/web/common/TemplateModel.java     |  6 ++++++
 .../src/main/webapp/common/configuration.zul        |  7 +++++++
 10 files changed, 67 insertions(+)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java
index 6e04ed0e6..c04df760e 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java
@@ -87,6 +87,8 @@ public class Configuration extends BaseEntity {
 
     private LDAPConfiguration ldapConfiguration;
 
+    private Boolean checkNewVersionEnabled = true;
+
     public void setDefaultCalendar(BaseCalendar defaultCalendar) {
         this.defaultCalendar = defaultCalendar;
     }
@@ -340,4 +342,13 @@ public class Configuration extends BaseEntity {
     public void setAutocompleteLogin(Boolean autocompleteLogin) {
         this.autocompleteLogin = autocompleteLogin;
     }
+
+    public boolean isCheckNewVersionEnabled() {
+        return checkNewVersionEnabled != null ? checkNewVersionEnabled : true;
+    }
+
+    public void setCheckNewVersionEnabled(boolean checkNewVersionEnabled) {
+        this.checkNewVersionEnabled = checkNewVersionEnabled;
+    }
+
 }
diff --git a/libreplan-business/src/main/resources/db.changelog-1.2.xml b/libreplan-business/src/main/resources/db.changelog-1.2.xml
index af260567f..29fa8c55d 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.2.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.2.xml
@@ -32,4 +32,17 @@
         </sql>
     </changeSet>
 
+    <changeSet id="add-new-column-check_new_version_enabled" author="mrego">
+        <comment>Add new column check_new_version_enabled with default value TRUE to configuration table</comment>
+        <addColumn tableName="configuration">
+            <column name="check_new_version_enabled" type="BOOLEAN" />
+        </addColumn>
+        <addDefaultValue tableName="configuration" columnName="check_new_version_enabled"
+           defaultValueBoolean="TRUE" />
+        <addNotNullConstraint tableName="configuration"
+           columnName="check_new_version_enabled"
+            defaultNullValue="TRUE"
+            columnDataType="BOOLEAN" />
+    </changeSet>
+
 </databaseChangeLog>
diff --git a/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Configuration.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Configuration.hbm.xml
index 88c5cc43a..236e58bb8 100644
--- a/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Configuration.hbm.xml
+++ b/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Configuration.hbm.xml
@@ -51,6 +51,8 @@
             column="changed_default_wswriter_password" />
         <property name="autocompleteLogin" not-null="true"
             column="enabled_autocomplete_login" />
+        <property name="checkNewVersionEnabled" not-null="true"
+            column="check_new_version_enabled" />
         <property name="progressType" column="progress_type">
             <type name="org.hibernate.type.EnumType">
                 <param name="enumClass">org.libreplan.business.common.entities.ProgressType</param>
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
index e658348c8..086ce17cf 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
@@ -839,4 +839,12 @@ public class ConfigurationController extends GenericForwardComposer {
         return !getLdapConfiguration().getLdapGroupStrategy();
     }
 
+    public boolean isCheckNewVersionEnabled() {
+        return configurationModel.isCheckNewVersionEnabled();
+    }
+
+    public void setCheckNewVersionEnabled(boolean checkNewVersionEnabled) {
+        configurationModel.setCheckNewVersionEnabled(checkNewVersionEnabled);
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java
index b8f926a57..0e6228473 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java
@@ -554,4 +554,14 @@ public class ConfigurationModel implements IConfigurationModel {
     public LDAPConfiguration getLdapConfiguration() {
         return configuration.getLdapConfiguration();
     }
+
+    @Override
+    public boolean isCheckNewVersionEnabled() {
+        return configuration.isCheckNewVersionEnabled();
+    }
+
+    @Override
+    public void setCheckNewVersionEnabled(boolean checkNewVersionEnabled) {
+        configuration.setCheckNewVersionEnabled(checkNewVersionEnabled);
+    }
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java
index d339132bd..fb28e73fe 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java
@@ -150,4 +150,8 @@ public interface IConfigurationModel {
     Boolean isChangedDefaultPasswdAdmin();
 
     void setAutocompleteLogin(Boolean autocompleteLogin);
+
+    boolean isCheckNewVersionEnabled();
+
+    void setCheckNewVersionEnabled(boolean checkNewVersionEnabled);
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ITemplateModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ITemplateModel.java
index 8736564a4..b8c6e43d2 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ITemplateModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ITemplateModel.java
@@ -58,4 +58,6 @@ public interface ITemplateModel {
 
     boolean isUserAdmin();
 
+    boolean isCheckNewVersionEnabled();
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java
index 01a72b305..15b038354 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java
@@ -184,6 +184,10 @@ public class TemplateController extends GenericForwardComposer {
     }
 
     public boolean isNewVersionAvailable() {
+        if (!templateModel.isCheckNewVersionEnabled()) {
+            return false;
+        }
+
         return VersionInformation.isNewVersionAvailable();
     }
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java
index ad2eedd33..d663896c7 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java
@@ -484,4 +484,10 @@ public class TemplateModel implements ITemplateModel {
     public boolean isUserAdmin() {
         return UserUtil.getUserFromSession().isAdministrator();
     }
+
+    @Override
+    @Transactional(readOnly = true)
+    public boolean isCheckNewVersionEnabled() {
+        return configurationDAO.getConfiguration().isCheckNewVersionEnabled();
+    }
 }
diff --git a/libreplan-webapp/src/main/webapp/common/configuration.zul b/libreplan-webapp/src/main/webapp/common/configuration.zul
index a63d76bcd..2f3771379 100644
--- a/libreplan-webapp/src/main/webapp/common/configuration.zul
+++ b/libreplan-webapp/src/main/webapp/common/configuration.zul
@@ -92,6 +92,13 @@
                                     checked="@{configurationController.autocompleteLogin}"
                                     onCheck="configurationController.reloadGeneralConfiguration();" />
                             </row>
+                            <row>
+                                <label value="${i18n:_('Warning new version')}" />
+                                <checkbox
+                                    label="${i18n:_('Enable/Disable')}"
+                                    tooltiptext="${i18n:_('Enable/Disable warning about new LibrePlan versions available')}"
+                                    checked="@{configurationController.checkNewVersionEnabled}" />
+                            </row>
                             <row>
                                 <label value="${i18n:_('Generate code for')}" />
                                 <grid>