alchemymvc 1.2.8 → 1.3.0

package/lib/app/helper_model/model.js

@@ -142,6 +142,19 @@ Model.setProperty(function datasource() {
 	return fallback_datasource;
 });
 
+/**
+ * Does this model have translatable fields?
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ *
+ * @type     {Boolean}
+ */
+Model.setProperty(function has_translatable_fields() {
+	return this.schema.has_translatable_fields;
+});
+
 /**
  * The conduit
  *
@@ -349,7 +362,7 @@ Model.setProperty(function name() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.0
  *
  * @param    {Object}   options
  */
@@ -371,7 +384,7 @@ Model.setMethod(function init(options) {
 	}
 
 	// Initialize behaviours
-	if (this.schema && this.schema.hasBehaviours && this.initBehaviours) {
+	if (this.schema && this.schema.has_behaviours && this.initBehaviours) {
 		this.initBehaviours();
 	}
 });
@@ -568,7 +581,7 @@ Model.setMethod(function getAliasModel(alias) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.2.5
+ * @version  1.3.0
  *
  * @param    {String}     type       The type of find (first, all)
  * @param    {Criteria}   criteria   The criteria object
@@ -626,10 +639,17 @@ Model.setMethod(function find(type, criteria, callback) {
 		return pledge;
 	}
 
+	if (this.conduit) {
+		criteria.conduit = this.conduit;
+	}
+
+	if (!criteria.options.locale && this.conduit) {
+		criteria.setOption('locale', this.conduit.prefix);
+	}
+
 	let that = this,
 	    available,
 	    records,
-	    query,
 	    Type;
 
 	// The criteria instance has to know about the model
@@ -1310,8 +1330,7 @@ Model.setMethod(function save(data, _options, _callback) {
 		return iter.hasNext();
 	}, function saveData(next) {
 
-		var document = iter.next().value,
-		    temp;
+		var document = iter.next().value;
 
 		// Skip invalid items
 		if (!document) {
@@ -1360,9 +1379,9 @@ Model.setMethod(function save(data, _options, _callback) {
  * Create a new document.
  * If data is given, the document is populated
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.0
  *
  * @param    {Object}    data     Optional data
  * @param    {Object}    options
@@ -1371,13 +1390,15 @@ Model.setMethod(function save(data, _options, _callback) {
  */
 Model.setMethod(function createDocument(data, options) {
 
-	var doc;
+	let original_record;
 
 	if (!options) {
 		options = {};
 	}
 
 	if (data && this.constructor.Document.isDocument(data)) {
+		original_record = data.$attributes.original_record;
+
 		data = {
 			[data.$model_alias] : data.$main,
 		};
@@ -1385,7 +1406,11 @@ Model.setMethod(function createDocument(data, options) {
 
 	options.model = this;
 
-	doc = new this.constructor.Document(data, options);
+	let doc = new this.constructor.Document(data, options);
+
+	if (original_record) {
+		doc.$attributes.original_record = original_record;
+	}
 
 	return doc;
 });

package/lib/bootstrap.js

@@ -160,6 +160,7 @@ hawkejs_options.server = false;
  * @version  1.1.0
  */
 alchemy.hawkejs.load(libpath.resolve(PATH_CORE, 'class', 'path_definition.js'), hawkejs_options);
+alchemy.hawkejs.load(libpath.resolve(PATH_CORE, 'class', 'path_param_definition.js'), hawkejs_options);
 
 /**
  * Require the element class on the client side too