corrected FileSystem adapter file mime lookup call

admin/client/App/screens/Home/components/ListTile.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router';
+import { GlyphButton } from '../../../elemental';
 
 /**
  * Displays information about a list and lets you create a new one.
@@ -12,6 +13,47 @@ var ListTile = React.createClass({
 		label: React.PropTypes.string,
 		path: React.PropTypes.string,
 		spinner: React.PropTypes.object,
+		list: React.PropTypes.object
+	},
+	contextTypes: {
+		router: React.PropTypes.object.isRequired,
+	},
+	// directly copied from admin/client/App/screens/List/index.js
+	createAutocreate () {
+		const list = this.props.list;
+		list.createItem(null, (err, data) => {
+			if (err) {
+				// TODO Proper error handling
+				alert('Something went wrong, please try again!');
+				console.log(err);
+			} else {
+				this.context.router.push(`${Keystone.adminPath}/${list.path}/${data.id}`);
+			}
+		});
+	},
+	renderCreateButton () {
+		const { nocreate, autocreate, singular } = this.props.list;
+
+		if (nocreate) return null;
+
+		if (autocreate) {
+			return (
+				<Link 
+					className="dashboard-group__list-create octicon octicon-plus"
+					title="Create"
+					tabIndex="-1"
+					onClick={this.createAutocreate} />
+			)
+		} else {
+			return (
+				<Link
+					to={this.props.href + '?create'}
+					className="dashboard-group__list-create octicon octicon-plus"
+					title="Create"
+					tabIndex="-1"
+				/>
+			);
+		}	
 	},
 	render () {
 		var opts = {
@@ -27,12 +69,7 @@ var ListTile = React.createClass({
 					{/* If we want to create a new list, we append ?create, which opens the
 						create form on the new page! */}
 					{(!this.props.hideCreateButton) && (
-						<Link
-							to={this.props.href + '?create'}
-							className="dashboard-group__list-create octicon octicon-plus"
-							title="Create"
-							tabIndex="-1"
-						/>
+						this.renderCreateButton()
 					)}
 				</span>
 			</div>

admin/client/App/screens/Home/components/Lists.js

@@ -10,6 +10,11 @@ export class Lists extends React.Component {
 		return (
 			<div className="dashboard-group__lists">
 				{_.map(this.props.lists, (list, key) => {
+					// then it's not a list, but an external link, so render it like that
+					if (typeof list === 'object' && list.external) {
+						const externalLink = list
+						return <a href={externalLink.path}>{ externalLink.label }</a>
+					}
 					// If an object is passed in the key is the index,
 					// if an array is passed in the key is at list.key
 					const listKey = list.key || key;
@@ -18,6 +23,7 @@ export class Lists extends React.Component {
 					const isNoCreate = listData ? listData.nocreate : false;
 					return (
 						<ListTile
+							list={listData}
 							key={list.path}
 							path={list.path}
 							label={list.label}

admin/client/App/screens/Item/components/EditFormHeader.js

@@ -17,6 +17,9 @@ export const EditFormHeader = React.createClass({
 		list: React.PropTypes.object,
 		toggleCreate: React.PropTypes.func,
 	},
+	contextTypes: {
+		router: React.PropTypes.object.isRequired,
+	},
 	getInitialState () {
 		return {
 			searchString: '',
@@ -130,17 +133,33 @@ export const EditFormHeader = React.createClass({
 			</ToolbarSection>
 		);
 	},
+	// directly copied from admin/client/App/screens/List/index.js
+	createAutocreate () {
+		const list = this.props.list;
+		list.createItem(null, (err, data) => {
+			if (err) {
+				// TODO Proper error handling
+				alert('Something went wrong, please try again!');
+				console.log(err);
+			} else {
+				this.context.router.push(`${Keystone.adminPath}/${list.path}/${data.id}`);
+			}
+		});
+	},
 	renderCreateButton () {
 		const { nocreate, autocreate, singular } = this.props.list;
 
 		if (nocreate) return null;
 
 		let props = {};
+
 		if (autocreate) {
-			props.href = '?new' + Keystone.csrf.query;
+			props.onClick = () => { this.createAutocreate() };
+			//props.href = '?new' + Keystone.csrf.query;
 		} else {
 			props.onClick = () => { this.toggleCreate(true); };
 		}
+
 		return (
 			<GlyphButton data-e2e-item-create-button="true" color="success" glyph="plus" position="left" {...props}>
 				<ResponsiveText hiddenXS={`New ${singular}`} visibleXS="Create" />

admin/public/styles/keystone/field-types.less

@@ -2,9 +2,6 @@
 // Field Types
 // ==============================
 
-
-
-
 // Code
 // ------------------------------
 

admin/server/api/s3.js

@@ -20,6 +20,14 @@ module.exports = {
 			var file = req.files.file;
 			var path = s3Config.s3path ? s3Config.s3path + '/' : '';
 
+			if (!file.name) {
+				var extension;
+				if (file.originalname) {
+					extension = file.originalname.match(/.*(\..*)/);
+				}
+				file.name = file.filename + (extension ? extension[1] : '');
+			}
+
 			var headers = Types.S3File.prototype.generateHeaders.call({ s3config: s3Config, options: {} }, null, file);
 
 			var s3Client = knox.createClient(s3Config);

docs/documentation/Configuration/AdminUI-Options.md

@@ -63,11 +63,12 @@ You need to supply an object containing the labels of the menu items as keys and
 
 You can also use an array of model paths as values. This allows to create a second level menu which will appear when you click on the first level menu item (see the `posts` key in the example below).
 
-If you need to add an external link to the menu, you can use an object to provide the following information (see the  `externalLink` key in the example below):
+If you need to add an external link to the menu, you can use an object wrapped in an array to provide the following information (see the  `externalLink` key in the example below):
 
 - `label`: the actual label of the menu item
 - `key`: a key used internally
 - `path`: the url to point to
+- `external`: always true, currently required
 
 **Example of navigation bar**
 
@@ -77,10 +78,11 @@ keystone.set('nav', {
 	'galleries': 'galleries',
 	'enquiries': 'enquiries',
 	'users': 'users',
-	'externalLink': {
+	'externalLink': [{
 		label: 'Keystone',
 		key: 'keystone',
-		path: 'http://keystonejs.com/'
-	}
+    path: 'http://keystonejs.com/',
+    external: true
+	}]
 });
 ```

fields/types/Type.js

@@ -52,7 +52,9 @@ function Field (list, path, options) {
 	this.label = options.label || utils.keyToLabel(this.path);
 	this.typeDescription = options.typeDescription || this.typeDescription || this.type;
 
-	this.list.automap(this);
+	if (!options._isNested) {
+		this.list.automap(this);
+	}
 
 	// Warn on required fields that aren't initial
 	if (this.options.required
@@ -79,10 +81,12 @@ function Field (list, path, options) {
 	}
 
 	// Add the field to the schema
-	this.addToSchema(this.list.schema);
+	this.addToSchema(options._isNested ? options._nestedSchema : this.list.schema);
 
 	// Add pre-save handler to the list if this field watches others
-	if (this.options.watch) {
+	if (options._isNested && this.options.watch) {
+		throw new Error('Nested fields do not support the `watch` option.');
+	} else if (this.options.watch) {
 		this.list.schema.pre('save', this.getPreSaveWatcher());
 	}
 

fields/types/file/FileField.js

@@ -55,7 +55,10 @@ module.exports = Field.create({
 	},
 	componentWillUpdate (nextProps) {
 		// Show the new filename when it's finished uploading
-		if (this.props.value.filename !== nextProps.value.filename) {
+		const oldFilename = this.props.value && this.props.value.filename;
+		const newFilename = nextProps.value && nextProps.value.filename;
+
+		if (newFilename !== oldFilename) {
 			this.setState(buildInitialState(nextProps));
 		}
 	},

fields/types/list/ListColumn.js

@@ -0,0 +1,32 @@
+import React from 'react';
+import ItemsTableCell from '../../components/ItemsTableCell';
+import ItemsTableValue from '../../components/ItemsTableValue';
+import { plural } from '../../../admin/client/utils/string';
+
+var ListColumn = React.createClass({
+	displayName: 'ListColumn',
+	propTypes: {
+		col: React.PropTypes.object,
+		data: React.PropTypes.object,
+	},
+	getValue () {
+		var value = this.props.data.fields[this.props.col.path];
+		if (Array.isArray(value)) {
+			return plural(value.length, '* Value', '* Values');
+		} else {
+			return '';
+		}
+	},
+	render () {
+		const value = this.getValue();
+		return (
+			<ItemsTableCell>
+				<ItemsTableValue padded interior field={this.props.col.type}>
+					{value}
+				</ItemsTableValue>
+			</ItemsTableCell>
+		);
+	},
+});
+
+module.exports = ListColumn;