Skip to content
This repository was archived by the owner on Nov 28, 2021. It is now read-only.

updates model and filter definitions to meet latest closure requirements #181

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

updates model and filter definitions to meet latest closure requirements #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions prestans/devel/gen/templates/closure/filter/filter.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ goog.require('{{dependency}}');
*/
{{namespace}}.{{name}} = function(opt_defaultValue) {

if(!goog.isBoolean(opt_defaultValue))
if(typeof opt_defaultValue !== 'boolean')
opt_defaultValue = false;

{% for attribute in attributes %}
Expand Down Expand Up @@ -84,12 +84,12 @@ goog.inherits({{namespace}}.{{name}}, prestans.types.Filter);
*/
{{namespace}}.{{name}}.prototype.getJSONObject = function(minified, opt_complete) {

if(!goog.isBoolean(opt_complete))
if(typeof opt_complete !== 'boolean')
opt_complete = false;

var jsonifiedObject_ = {};

if(goog.isDef(minified) && goog.isBoolean(minified) && minified) {
if(minified !== undefined && typeof minified === 'boolean' && minified) {
{% for attribute in attributes %}
{{filter.minifiedAttribute(namespace, name, attribute)}}
{% endfor %}
Expand Down
50 changes: 25 additions & 25 deletions prestans/devel/gen/templates/closure/model/model.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ goog.require('{{dependency}}');
//Setup base model
prestans.types.Model.call(this);

if(!goog.isDef(opt_raiseValidateException))
if(opt_raiseValidateException === undefined)
opt_raiseValidateException = true;

if(goog.isDef(opt_minified) && goog.isBoolean(opt_minified) && opt_minified && goog.isDefAndNotNull(opt_json)) {
if(opt_minified !== undefined && typeof opt_minified === 'boolean' && opt_minified && opt_json != null) {
{% for attribute in attributes %}{{model.minifiedAttributeWithJson(namespace, name, attribute)}}{% endfor %}
}
else if(goog.isDefAndNotNull(opt_json)) {
else if(opt_json != null) {
{% for attribute in attributes %}{{model.attributeWithJson(namespace, name, attribute)}}{% endfor %}
}
else {
Expand Down Expand Up @@ -266,88 +266,88 @@ goog.inherits({{namespace}}.{{name}}, prestans.types.Model);
{{namespace}}.{{name}}.prototype.getJSONObject = function(minified, opt_filter) {

{% if filter_namespace != None %}//check that filter is of correct type
if(goog.isDefAndNotNull(opt_filter) && !(opt_filter instanceof {{filter_namespace}}.{{name}}))
if(opt_filter != null && !(opt_filter instanceof {{filter_namespace}}.{{name}}))
throw "Incorrect filter for this model";
{% endif %}

var jsonifiedObject_ = {};

if(goog.isDef(minified) && goog.isBoolean(minified) && minified) {
if(minified !== undefined && typeof minified === 'boolean' && minified) {
{% for attribute in attributes %}
{% if attribute.blueprint_type == 'model' %}
if(goog.isDef(opt_filter) && opt_filter.get{{attribute.cc}}().anyFieldsEnabled()) {
if(opt_filter !== undefined && opt_filter.get{{attribute.cc}}().anyFieldsEnabled()) {
if(this.get{{attribute.cc}}() == null)
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = null;
else
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = this.get{{attribute.cc}}().getJSONObject(true, opt_filter.get{{attribute.cc}}());
}
else if(!goog.isDef(opt_filter)) {
else if(opt_filter === undefined) {
if(this.get{{attribute.cc}}() == null)
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = null;
else
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = this.get{{attribute.cc}}().getJSONObject(true);
}
{% elif attribute.blueprint_type == 'array' %}
{% if attribute.element_template_is_model %}
if(goog.isDef(opt_filter) && opt_filter.get{{attribute.cc}}().anyFieldsEnabled())
if(opt_filter !== undefined && opt_filter.get{{attribute.cc}}().anyFieldsEnabled())
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = this.get{{attribute.cc}}().getJSONObject(true, opt_filter.get{{attribute.cc}}());
else if(!goog.isDef(opt_filter))
else if(opt_filter === undefined)
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = this.get{{attribute.cc}}().getJSONObject(true);
{% else %}
if(goog.isDef(opt_filter) && opt_filter.get{{attribute.cc}}())
if(opt_filter !== undefined && opt_filter.get{{attribute.cc}}())
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = this.get{{attribute.cc}}().getJSONObject(true);
else if(!goog.isDef(opt_filter))
else if(opt_filter === undefined)
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = this.get{{attribute.cc}}().getJSONObject(true);
{% endif %}
{% elif attribute.blueprint_type == 'datetime' or attribute.blueprint_type == 'date' or attribute.blueprint_type == 'time' %}
if(goog.isDef(opt_filter) && opt_filter.get{{attribute.cc}}())
if(opt_filter !== undefined && opt_filter.get{{attribute.cc}}())
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = this.{{attribute.ccif}}_.getJSONObject();
else if(!goog.isDef(opt_filter))
else if(opt_filter === undefined)
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = this.{{attribute.ccif}}_.getJSONObject();
{% else %}
if(goog.isDef(opt_filter) && opt_filter.get{{attribute.cc}}())
if(opt_filter !== undefined && opt_filter.get{{attribute.cc}}())
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = this.get{{attribute.cc}}();
else if(!goog.isDef(opt_filter))
else if(opt_filter === undefined)
jsonifiedObject_[{{namespace}}.{{name}}.REWRITE_MAP["{{attribute.name}}"]] = this.get{{attribute.cc}}();
{% endif %}
{% endfor %}
}
else {
{% for attribute in attributes %}
{% if attribute.blueprint_type == 'model' %}
if(goog.isDef(opt_filter) && opt_filter.get{{attribute.cc}}().anyFieldsEnabled()) {
if(opt_filter !== undefined && opt_filter.get{{attribute.cc}}().anyFieldsEnabled()) {
if(this.get{{attribute.cc}}() == null)
jsonifiedObject_["{{attribute.name}}"] = null;
else
jsonifiedObject_["{{attribute.name}}"] = this.get{{attribute.cc}}().getJSONObject(false, opt_filter.get{{attribute.cc}}());
}
else if(!goog.isDef(opt_filter)) {
else if(opt_filter === undefined) {
if(this.get{{attribute.cc}}() == null)
jsonifiedObject_["{{attribute.name}}"] = null;
else
jsonifiedObject_["{{attribute.name}}"] = this.get{{attribute.cc}}().getJSONObject(false);
}
{% elif attribute.blueprint_type == 'array' %}
{% if attribute.element_template_is_model %}
if(goog.isDef(opt_filter) && opt_filter.get{{attribute.cc}}().anyFieldsEnabled())
if(opt_filter !== undefined && opt_filter.get{{attribute.cc}}().anyFieldsEnabled())
jsonifiedObject_["{{attribute.name}}"] = this.get{{attribute.cc}}().getJSONObject(false, opt_filter.get{{attribute.cc}}());
else if(!goog.isDef(opt_filter))
else if(opt_filter === undefined)
jsonifiedObject_["{{attribute.name}}"] = this.get{{attribute.cc}}().getJSONObject(false);
{% else %}
if(goog.isDef(opt_filter) && opt_filter.get{{attribute.cc}}())
if(opt_filter !== undefined && opt_filter.get{{attribute.cc}}())
jsonifiedObject_["{{attribute.name}}"] = this.get{{attribute.cc}}().getJSONObject(false);
else if(!goog.isDef(opt_filter))
else if(opt_filter === undefined)
jsonifiedObject_["{{attribute.name}}"] = this.get{{attribute.cc}}().getJSONObject(false);
{% endif %}
{% elif attribute.blueprint_type == 'datetime' or attribute.blueprint_type == 'date' or attribute.blueprint_type == 'time' %}
if(goog.isDef(opt_filter) && opt_filter.get{{attribute.cc}}())
if(opt_filter !== undefined && opt_filter.get{{attribute.cc}}())
jsonifiedObject_["{{attribute.name}}"] = this.{{attribute.ccif}}_.getJSONObject();
else if(!goog.isDef(opt_filter))
else if(opt_filter === undefined)
jsonifiedObject_["{{attribute.name}}"] = this.{{attribute.ccif}}_.getJSONObject();
{% else %}
if(goog.isDef(opt_filter) && opt_filter.get{{attribute.cc}}())
if(opt_filter !== undefined && opt_filter.get{{attribute.cc}}())
jsonifiedObject_["{{attribute.name}}"] = this.get{{attribute.cc}}();
else if(!goog.isDef(opt_filter))
else if(opt_filter === undefined)
jsonifiedObject_["{{attribute.name}}"] = this.get{{attribute.cc}}();
{% endif %}
{% endfor %}
Expand Down