update

.eslintrc

@@ -37,6 +37,7 @@
 		"react/self-closing-comp": 1,
 		"react/wrap-multilines": 1,
 		"semi": 2,
+		"space-infix-ops": 0,
 		"strict": 0,
 		"yoda": 0
 	},

CONTRIBUTING.md

@@ -14,23 +14,13 @@ early and is a good way to discuss what you're planning to do.
 * If you open an issue and are interested in working on a fix, please let us
 know. We'll help you get started, rather than adding it to the queue.
 * Make sure you do not add regressions by running `npm test`. Please also
-[follow our established coding conventions](https://github.com/keystonejs/keystone/wiki/Coding-Standards) 
+[follow our established coding conventions](https://github.com/keystonejs/keystone/wiki/Coding-Standards)
 (with regards to formatting, etc)
 * You can also run `npm run lint` and `npm run style` - our linter is a WIP
 but please ensure there are not more violations than before your changes.
 * All new features and changes need documentation. They live over at the  [Keystone-site](https://github.com/keystonejs/keystonejs-site) repo.
 * We have three translations so far,
 please read our [Documentation Translation  Guidelines](https://github.com/keystonejs/keystone/wiki/Documentation-Translation-Guidelines).
-* **PRO TIP**: If you've opened an issue and have come up with a solution
-yourself, we prefer you to convert the already existing issue into a PR instead
-of opening a new one. This can be done with the [hub command line tool](https://github.com/github/hub)
-
-  Example:
-  ```sh
-  # convert issue 1239 into a pull-request sending all commits from `fix_hooks` branch in creynders'
-  # keystone fork to the `master` branch of the official repo
-  hub pull-request -i 1239 -b keystonejs/keystone:master -h creynders/keystone:fix_hooks
-  ```
 
 If you are working on the React Admin UI, you'll also need to know this:
 

HISTORY.md

@@ -2,6 +2,20 @@
 
 KeystoneJS is maintained by [@JedWatson](https://github.com/JedWatson) and an amazing team of contributors. All contributions are given credit here except for Jed's.
 
+## v0.3.13 / 2015-08-03
+
+* improved; major speed increase for initialisation
+* improved; codemirror is now only loaded as required, thanks [Carlos Colon](https://github.com/webteckie)
+* fixed; correctly handling blank values in the DateInput component
+* changed; switched to babyparse for CSV generation
+* fixed; docs links now point to keystone site
+* fixed; add Maps API key to request, allow override per model, check for server instead of browser key, thanks [stosorio](https://github.com/stosorio)
+* fixed; added check for duplicate `_revisions` models, thanks [Jeffrey](https://github.com/jeffreypriebe)
+* fixed; localFile .format property ignored by Admin U, thanks [Javier Castro](https://github.com/jacargentina)
+* fixed; href working correctly on LocalFiles Type, thanks [Matthias Tylkowski](https://github.com/tylkomat)
+* added; several new API endpoints for the Admin UI in preparation of the 0.4 release
+
+
 ## v0.3.12 / 2015-06-26
 
 * fixed; `height` option for TextArea fields was not respected in the Admin UI, thanks [Eóin Martin](https://github.com/SlashmanX)

README.md

@@ -1,9 +1,9 @@
 ![KeystoneJS](http://keystonejs.com/images/logo.svg)
 ===================================
 
-![Build Status](https://travis-ci.org/keystonejs/keystone.svg)
+[![Build Status](https://travis-ci.org/keystonejs/keystone.svg?branch=master)](https://travis-ci.org/keystonejs/keystone)
 
-[KeystoneJS](http://keystonejs.com) is a powerful Node.js content management system and web app framework built on [express](http://expressjs.com) and [mongoose](http://mongoosejs.com) that makes it easy to create sophisticated web sites and apps, and gives you a beautiful, auto-generated Admin UI.
+[KeystoneJS](http://keystonejs.com) is a powerful Node.js content management system and web app framework built on [express](http://expressjs.com) and [mongoose](http://mongoosejs.com). Keystone makes it easy to create sophisticated web sites and apps, and comes with a beautiful auto-generated Admin UI.
 
 Check out [keystonejs.com](http://keystonejs.com) for documentation and guides.
 
@@ -130,7 +130,7 @@ To understand how these settings are used, and how the Express application is in
 Keystone builds on the basic data types provided by mongo and allows you to easily add rich,
 functional fields to your application's models.
 
-You get helper methods on your models for dealing with each field type easily (such as 
+You get helper methods on your models for dealing with each field type easily (such as
 formatting a date or number, resizing an image, getting an array of the available options
 for a select field, or using Google's Places API to improve addresses) as well as a beautiful,
 responsive admin UI to edit your data with.

admin/api/item/get.js

@@ -6,6 +6,11 @@ module.exports = function(req, res) {
 
 	var query = req.list.model.findById(req.params.id);
 
+	var fields = req.query.fields;
+	if (req.query.basic !== undefined) {
+		fields = false;
+	}
+
 	if (req.list.tracking && req.list.tracking.createdBy) {
 		query.populate(req.list.tracking.createdBy);
 	}
@@ -19,7 +24,6 @@ module.exports = function(req, res) {
 		if (err) return res.status(500).json({ err: 'database error', detail: err });
 		if (!item) return res.status(404).json({ err: 'not found', id: req.params.id });
 
-
 		var tasks = [];
 		var drilldown;
 		var relationships;
@@ -147,11 +151,10 @@ module.exports = function(req, res) {
 					detail: err
 				});
 			}
-			res.json({
-				data: req.list.getData(item, req.query.fields),
+			res.json(_.assign(req.list.getData(item, fields), {
 				drilldown: drilldown,
 				relationships: relationships
-			});
+			}));
 		});
 	});
 };

admin/api/list.js

@@ -74,26 +74,6 @@ exports = module.exports = function(req, res) {
 
 		break;
 
-		case 'get':
-
-			req.list.model.findById(req.query.id).exec(function(err, item) {
-
-				if (err) return sendError('database error', err);
-				if (!item) return sendResponse({ name: req.query.id, id: req.query.id });
-
-				switch (req.query.dataset) {
-					case 'simple':
-						return sendResponse({
-							name: req.list.getDocumentName(item, false),
-							id: item.id
-						});
-					default:
-						return sendResponse(item);
-				}
-			});
-
-		break;
-
 		case 'order':
 
 			if (!keystone.security.csrf.validate(req)) {

admin/api/list/get.js

@@ -0,0 +1,33 @@
+var async = require('async');
+
+module.exports = function(req, res) {
+	var filters = req.query.filters;
+	if (filters && typeof filters === 'string') {
+		try { filters = JSON.parse(req.query.filters); }
+		catch(e) { } // eslint-disable-line no-empty
+	}
+	if (typeof filters === 'object') {
+		filters = req.list.addFiltersToQuery(filters);
+	}
+	var query = req.list.model.find(filters);
+	async.series({
+		count: function(next) {
+			query.count(next);
+		},
+		items: function(next) {
+			query.find();
+			query.limit(Number(req.query.limit) || 100);
+			query.skip(Number(req.query.skip) || 0);
+			query.sort(req.query.sort || req.list.defaultSort);
+			query.exec(next);
+		}
+	}, function(err, results) {
+		if (err) return res.apiError('database error', err);
+		return res.json({
+			results: results.items.map(function (item) {
+				return req.list.getData(item, req.query.select);
+			}),
+			count: results.count
+		});
+	});
+};

admin/public/js/common/ui.js

@@ -161,11 +161,7 @@ jQuery(function($) {
 					};
 
 					$.each(ids, function() {
-						$.ajax('/keystone/api/' + refPath + '/get', {
-							data: {
-								id: this,
-								dataset: 'simple'
-							},
+						$.ajax('/keystone/api/' + refPath + '/' + this + '?simple', {
 							dataType: 'json'
 						}).done(loaded);
 					});

admin/public/js/lib/tinymce/skins/keystone/less/Icons.Ie7.less

@@ -64,7 +64,7 @@
 .mce-i-numlist        { -ie7-icon: "\e00b"; }
 .mce-i-indent         { -ie7-icon: "\e00c"; }
 .mce-i-outdent        { -ie7-icon: "\e00d"; }
-.mce-i-blockquote     { -ie7-icon: "\e00e"; }
+.mce-i-blockquote     { -ie7-icon: "\e801"; }
 .mce-i-undo           { -ie7-icon: "\e00f"; }
 .mce-i-redo           { -ie7-icon: "\e010"; }
 .mce-i-link           { -ie7-icon: "\e011"; }

admin/public/js/lib/tinymce/skins/keystone/less/Icons.less

@@ -45,6 +45,8 @@
 .mce-i-indent                     { &:before { content: '\e83f'; } }
 .mce-i-outdent                    { &:before { content: '\e840'; } }
 
+.mce-i-blockquote                 { &:before { content: '\e801'; } }
+
 .mce-i-bullist                    { &:before { content: '\e83e'; } }
 .mce-i-numlist                    { &:before { content: '\e83d'; } }
 
@@ -74,7 +76,7 @@
 .mce-i-numlist:before        { content: "\e00b"; }
 .mce-i-indent:before         { content: "\e00c"; }
 .mce-i-outdent:before        { content: "\e00d"; }
-.mce-i-blockquote:before     { content: "\e00e"; }
+.mce-i-blockquote:before     { content: "\e801"; }
 .mce-i-undo:before           { content: "\e00f"; }
 .mce-i-redo:before           { content: "\e010"; }
 .mce-i-link:before           { content: "\e011"; }
@@ -188,7 +190,7 @@ i.mce-i-backcolor            { text-shadow: none; background: @colorbtn-backcolo
 .mce-i-numlist:before        { content: "\e00b"; }
 .mce-i-indent:before         { content: "\e00c"; }
 .mce-i-outdent:before        { content: "\e00d"; }
-.mce-i-blockquote:before     { content: "\e00e"; }
+.mce-i-blockquote:before     { content: "\e801"; }
 .mce-i-undo:before           { content: "\e00f"; }
 .mce-i-redo:before           { content: "\e010"; }
 .mce-i-link:before           { content: "\e011"; }

admin/public/styles/keystone/forms.less

@@ -299,6 +299,9 @@ label.checkbox {
 		background: transparent;
 		border-radius: @input-border-radius;
 	}
+	.CodeMirror-linenumber{
+		margin-left:-30px;
+	}
 }
 
 // Related Items

admin/routes/views/item.js

@@ -1,13 +1,18 @@
-var keystone = require('../../../'),
-	_ = require('underscore'),
-	async = require('async');
+var keystone = require('../../../');
+var _ = require('underscore');
+var async = require('async');
 
 exports = module.exports = function(req, res) {
 
 	var itemQuery = req.list.model.findById(req.params.item).select();
 
 	itemQuery.exec(function(err, item) {
 
+		if (err) {
+			req.flash('error', 'A database error occurred.');
+			return res.redirect('/keystone/' + req.list.path);
+		}
+
 		if (!item) {
 			req.flash('error', 'Item ' + req.params.item + ' could not be found.');
 			return res.redirect('/keystone/' + req.list.path);

admin/src/components/ItemViewHeader.js

@@ -62,8 +62,8 @@ var Header = React.createClass({
 
 	renderDrilldownItems: function() {
 
-		var list = this.props.list,
-			items = this.props.drilldown.items;
+		var list = this.props.list;
+		var items = this.props.data.drilldown ? this.props.data.drilldown.items : [];
 
 		var els = items.map(function(dd) {
 

admin/src/views/item.js

@@ -13,26 +13,28 @@ var View = React.createClass({
 		return {
 			createIsVisible: false,
 			list: Keystone.list,
-			itemData: null,
-			itemDrilldown: null
+			itemData: null
 		};
 	},
 
 	componentDidMount: function() {
+		this.loadItemData();
+	},
+
+	loadItemData: function() {
 		request.get('/keystone/api/' + Keystone.list.path + '/' + this.props.itemId + '?drilldown=true')
 			.set('Accept', 'application/json')
-			.end(function(err, res) {//eslint-disable-line no-unused-vars, handle-callback-err
-				if (!res.ok) {
+			.end((err, res) => {
+				if (err || !res.ok) {
 					// TODO: nicer error handling
-					console.log('Error loading item data:', res.text);
+					console.log('Error loading item data:', res ? res.text : err);
 					alert('Error loading data (details logged to console)');
 					return;
 				}
-				this.setState({//eslint-disable-line react/no-did-mount-set-state
-					itemData: res.body.data,
-					itemDrilldown: res.body.drilldown 
+				this.setState({
+					itemData: res.body
 				});
-			}.bind(this));
+			});
 	},
 
 	toggleCreate: function(visible) {
@@ -51,7 +53,7 @@ var View = React.createClass({
 		return (
 			<div>
 				{this.renderCreateForm()}
-				<Header list={this.state.list} data={this.state.itemData} drilldown={this.state.itemDrilldown} toggleCreate={this.toggleCreate} />
+				<Header list={this.state.list} data={this.state.itemData} toggleCreate={this.toggleCreate} />
 				<EditForm list={this.state.list} data={this.state.itemData} />
 			</div>
 		);