Author: kwall
Date: Fri Apr 15 10:39:29 2016
New Revision: 1739275
URL: http://svn.apache.org/viewvc?rev=1739275&view=rev
Log:
QPID-7158: [Java Broker] Change truststore UI to render start/end dates using
user's preferred timezone
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/store/sitespecifictruststore/show.html
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1739275&r1=1739274&r2=1739275&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Fri Apr 15 10:39:29 2016
@@ -501,7 +501,7 @@ define(["dojo/_base/xhr",
}
- util.updateUI = function(data, fieldNames, obj)
+ util.updateUI = function(data, fieldNames, obj, formatters)
{
for(var i=0; i<fieldNames.length;i++)
{
@@ -510,7 +510,20 @@ define(["dojo/_base/xhr",
var fieldNode = obj[fieldName];
if (fieldNode)
{
- fieldNode.innerHTML= (value == undefined || value == null) ?
"" : entities.encode(String(value));
+ if (formatters && fieldNode.className)
+ {
+ var clazzes = fieldNode.className.split(" ");
+ for (var idx in clazzes)
+ {
+ var clazz = clazzes[idx];
+ var fmt = formatters[clazz];
+ if (fmt && value)
+ {
+ value = fmt(value);
+ }
+ }
+ }
+ fieldNode.innerHTML = (value == undefined || value == null)
? "" : entities.encode(String(value));
}
}
}
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js?rev=1739275&r1=1739274&r2=1739275&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
Fri Apr 15 10:39:29 2016
@@ -21,40 +21,24 @@ define(["qpid/common/util", "dojox/html/
function (util, entities)
{
- function toDate(value, userPreferences)
- {
- return value ?
entities.encode(String(userPreferences.formatDateTime(value, {addOffset: true,
appendTimeZone: true}))) : "";
- }
-
- var dateFields = ["certificateValidEnd","certificateValidStart"];
-
function NonJavaKeyStore(data)
{
+ var that = this;
this.fields = [];
this.management = data.parent.management;
+ this.dateTimeFormatter = function(value){ return value ?
that.management.userPreferences.formatDateTime(value, {addOffset: true,
appendTimeZone: true}) : "";};
+
var attributes = this.management.metadata.getMetaData("KeyStore",
"NonJavaKeyStore").attributes;
for(var name in attributes)
{
- if (dateFields.indexOf(name) == -1)
- {
- this.fields.push(name);
- }
+ this.fields.push(name);
}
- var allFields = this.fields.concat(dateFields);
- util.buildUI(data.containerNode, data.parent,
"store/nonjavakeystore/show.html",allFields, this);
+ util.buildUI(data.containerNode, data.parent,
"store/nonjavakeystore/show.html", this.fields, this);
}
NonJavaKeyStore.prototype.update = function(data)
{
- util.updateUI(data, this.fields, this);
- if (data)
- {
- for(var idx in dateFields)
- {
- var name = dateFields[idx];
- this[name].innerHTML = toDate(data[name],
this.management.userPreferences);
- }
- }
+ util.updateUI(data, this.fields, this, {datetime:
this.dateTimeFormatter});
}
return NonJavaKeyStore;
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/show.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/show.js?rev=1739275&r1=1739274&r2=1739275&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/show.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/show.js
Fri Apr 15 10:39:29 2016
@@ -28,20 +28,21 @@ define(["dojo/query",
function SiteSpecificTrustStore(data)
{
+ var that = this;
this.fields = [];
this.management = data.parent.management;
+ this.dateTimeFormatter = function(value){ return value ?
that.management.userPreferences.formatDateTime(value, {addOffset: true,
appendTimeZone: true}) : "";};
var attributes = this.management.metadata.getMetaData("TrustStore",
"SiteSpecificTrustStore").attributes;
for(var name in attributes)
{
- this.fields.push(name);
+ this.fields.push(name);
}
- var that = this;
util.buildUI(data.containerNode, data.parent,
"store/sitespecifictruststore/show.html", this.fields, this);
}
SiteSpecificTrustStore.prototype.update = function(data)
{
- util.updateUI(data, this.fields, this);
+ util.updateUI(data, this.fields, this, {datetime:
this.dateTimeFormatter});
}
return SiteSpecificTrustStore;
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html?rev=1739275&r1=1739274&r2=1739275&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html
Fri Apr 15 10:39:29 2016
@@ -36,11 +36,11 @@
</div>
<div class="clear">
<div class="formLabel-labelCell">Certificate valid to:</div>
- <div><span class="certificateValidEnd" ></span></div>
+ <div><span class="certificateValidEnd datetime" ></span></div>
</div>
<div class="clear">
<div class="formLabel-labelCell">Certificate valid from:</div>
- <div><span class="certificateValidStart" ></span></div>
+ <div><span class="certificateValidStart datetime" ></span></div>
</div>
<div class="clear"></div>
</div>
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/store/sitespecifictruststore/show.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/store/sitespecifictruststore/show.html?rev=1739275&r1=1739274&r2=1739275&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/store/sitespecifictruststore/show.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/store/sitespecifictruststore/show.html
Fri Apr 15 10:39:29 2016
@@ -36,11 +36,11 @@
</div>
<div class="clear">
<div class="formLabel-labelCell">Valid From:</div>
- <div><span class="certificateValidFromDate" ></span></div>
+ <div><span class="certificateValidFromDate datetime" ></span></div>
</div>
<div class="clear">
<div class="formLabel-labelCell">Valid Until:</div>
- <div><span class="certificateValidUntilDate" ></span></div>
+ <div><span class="certificateValidUntilDate datetime" ></span></div>
</div>
<div class="clear">
<div class="formLabel-labelCell">Signature:</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
