alchemymvc 1.2.5 → 1.2.7

package/lib/app/helper_field/schema_field.js

@@ -364,7 +364,7 @@ SchemaField.setMethod(function _toApp(query, options, value, callback) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.4
- * @version  1.1.4
+ * @version  1.2.6
  */
 SchemaField.setMethod(function translateRecord(prefixes, record, allow_empty) {
 
@@ -373,11 +373,18 @@ SchemaField.setMethod(function translateRecord(prefixes, record, allow_empty) {
 		translateRecord.super.call(this, prefixes, record, allow_empty);
 	}
 
+	if (!record.$translated_fields) {
+		record.$translated_fields = {};
+	}
+
 	// Turn it into an array, some already are (is_array fields)
 	let subject = Array.cast(record[this.name]),
-	    schema_record;
+	    schema_record,
+	    count = -1;
 
 	for (schema_record of subject) {
+		count++;
+
 		if (this.field_schema.hasTranslations && schema_record) {
 
 			let field_name,
@@ -386,6 +393,20 @@ SchemaField.setMethod(function translateRecord(prefixes, record, allow_empty) {
 			for (field_name in this.field_schema.translatableFields) {
 				field = this.field_schema.translatableFields[field_name];
 				field.translateRecord(prefixes, schema_record, allow_empty);
+
+				if (schema_record.$translated_fields) {
+					for (let key in schema_record.$translated_fields) {
+						let path = this.name;
+
+						if (this.is_array) {
+							path += '.' + count;
+						}
+
+						path += '.' + key;
+
+						record.$translated_fields[path] = schema_record.$translated_fields[key];
+					}
+				}
 			}
 		}
 	}

package/lib/app/helper_model/criteria.js

@@ -659,13 +659,18 @@ Criteria.setMethod(function augment(type) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.7
  *
  * @param    {Number}   amount
  *
  * @return   {Criteria}
  */
 Criteria.setMethod(function limit(amount) {
+
+	if (typeof amount != 'number') {
+		amount = parseInt(amount);
+	}
+
 	this.options.limit = amount;
 	return this;
 });
@@ -675,13 +680,18 @@ Criteria.setMethod(function limit(amount) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.7
  *
  * @param    {Number}   amount
  *
  * @return   {Criteria}
  */
 Criteria.setMethod(function skip(amount) {
+
+	if (typeof amount != 'number') {
+		amount = parseInt(amount);
+	}
+
 	this.options.skip = amount;
 	return this;
 });
@@ -691,7 +701,7 @@ Criteria.setMethod(function skip(amount) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.2.7
  *
  * @param    {Number}   page        A 1-indexed page number
  * @param    {Number}   page_size
@@ -700,6 +710,14 @@ Criteria.setMethod(function skip(amount) {
  */
 Criteria.setMethod(function page(page, page_size) {
 
+	if (typeof page != 'number') {
+		page = parseInt(page);
+	}
+
+	if (page_size && typeof page_size != 'number') {
+		page_size = parseInt(page_size);
+	}
+
 	if (!page) {
 		throw new Error('A page number is required');
 	}

package/lib/app/helper_model/field_config.js

@@ -161,7 +161,7 @@ FieldConfig.setMethod(function getModel() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.2
- * @version  1.2.5
+ * @version  1.2.7
  *
  * @return   {Field}
  */
@@ -178,7 +178,7 @@ FieldConfig.setMethod(function getFieldDefinition() {
 		let constructor = Classes.Alchemy.Field.Field.getMember(this.options.type);
 
 		if (constructor) {
-			result = new constructor(null, this.name);
+			result = new constructor(null, this.name, this.options);
 		}
 	}
 

package/lib/app/helper_model/model.js

@@ -188,7 +188,7 @@ Model.prepareStaticProperty('Document', function getDocumentClass() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.3
+ * @version  1.2.7
  *
  * @param    {String}   model_name
  * @param    {Boolean}  allow_create
@@ -237,8 +237,9 @@ Model.setStatic(function getClass(model_name, allow_create ) {
 
 			if (config && config.super) {
 				config = {
-					parent      : config.super.name,
-					primary_key : config.prototype.primary_key
+					parent        : config.super.name,
+					primary_key   : config.prototype.primary_key,
+					display_field : config.prototype.display_field,
 				};
 			}
 		}
@@ -252,8 +253,14 @@ Model.setStatic(function getClass(model_name, allow_create ) {
 
 		ModelClass.setProperty('$model_name', model_name);
 
-		if (config && config.primary_key) {
-			ModelClass.setProperty('primary_key', config.primary_key);
+		if (config) {
+			if (config.primary_key) {
+				ModelClass.setProperty('primary_key', config.primary_key);
+			}
+
+			if (config.display_field) {
+				ModelClass.setProperty('display_field', config.display_field);
+			}
 		}
 
 		if (Blast.isBrowser) {
@@ -414,6 +421,66 @@ Model.setMethod(function getFindOptions(options) {
 	return Object.assign({}, def_options, options);
 });
 
+
+/**
+ * Get the title to display for this record
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.0.1
+ * @version  1.2.7
+ *
+ * @param    {Object}        item       The record item of this model
+ * @param    {String|Array}  fallbacks  Extra fallbacks to use
+ * 
+ * @return   {String}        The display title to use
+ */
+Model.setMethod(function getDisplayTitle(item, fallbacks) {
+
+	if (!item) {
+		return 'Undefined item';
+	}
+
+	let main;
+
+	if (item[this.modelName]) {
+		main = item[this.modelName];
+	} else {
+		main = item;
+	}
+
+	if (!main) {
+		return 'Undefined item';
+	}
+
+	let field,
+	    val,
+	    i;
+
+	let fields = Array.cast(this.display_field);
+
+	if (fallbacks) {
+		fields = fields.concat(fallbacks);
+	}
+
+	for (i = 0; i < fields.length; i++) {
+		val = main[fields[i]];
+
+		if (Object.isObject(val)) {
+			field = this.getField(fields[i]);
+
+			if (field && field.isTranslatable) {
+				val = alchemy.pickTranslation(this.conduit, val).result;
+			}
+		}
+
+		if (val && typeof val == 'string') {
+			return val;
+		}
+	}
+
+	return main[this.primary_key] || '';
+});
+
 /**
  * Return association configuration
  *