Merge pull request #64 from heyday/master

BUGFIX: Error on closing if no file selected Fixes #50
unclecheese · Sep 28, 2016 · b61fb84 · b61fb84
2 parents d442cae + 5f217fe
commit b61fb84
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "unclecheese/silverstripe-kickassets",
+    "name": "heyday/silverstripe-kickassets",
     "description": "Provides an alternative file management interface for SilverStripe CMS with drag-and-drop, multi-selection, and several other desktop-like UI conventions.",
     "type": "silverstripe-module",
     "keywords": ["silverstripe", "assets", "files", "AssetAdmin", "upload"],

diff --git a/javascript/build/bundle.js b/javascript/build/bundle.js
@@ -54783,7 +54783,9 @@
 
 			var error = undefined;
 
-			if (!_storesSelectedItemsStore2['default'].isValidCount()) {
+			if (items.length === 0) {
+				error = (0, _utilsLang.sf)((0, _utilsLang2['default'])('KickAssets.NOFILESELECTED', "You haven't selected any file."));
+			} else if (!_storesSelectedItemsStore2['default'].isValidCount()) {
 				error = (0, _utilsLang.sf)((0, _utilsLang2['default'])('KickAssets.TOOMANYSELECTED', 'You have selected too many items. Please select no more than %s.'), max);
 			} else if (!_storesSelectedItemsStore2['default'].isValidTypes()) {
 				error = (0, _utilsLang.sf)((0, _utilsLang2['default'])('KickAssets.INVALIDTYPESSELECTED', 'You have selected some invalid items. Please select only %s'), types.join(', '));

diff --git a/javascript/build/bundle.min.js b/javascript/build/bundle.min.js
diff --git a/javascript/src/containers/SelectionButtonContainer.js b/javascript/src/containers/SelectionButtonContainer.js
@@ -45,7 +45,13 @@ const SelectionButtonContainer = React.createClass({
 
 		let error;
 
-		if(!SelectedItemsStore.isValidCount()) {
+		if(items.length === 0) {
+			error = sf(_t(
+				'KickAssets.NOFILESELECTED',
+				"You haven't selected any file."));
+		}
+
+		else if(!SelectedItemsStore.isValidCount()) {
 			error = sf(_t(
 				'KickAssets.TOOMANYSELECTED',
 				'You have selected too many items. Please select no more than %s.'

diff --git a/lang/da.js b/lang/da.js
@@ -48,6 +48,7 @@ else {
 		'KickAssets.DONE': 'Færdig',
 		'KickAssets.TOOMANYSELECTED': 'Du har valgt for mange filer. Vælg ikke flere end %s.',
 		'KickAssets.INVALIDTYPESSELECTED': 'Du har valgt nogle ugyldige filer. Vælg kun %s',
-		'KickAssets.INVALIDEXTENSIONSSELECTED': 'Du har valgt nogle filer med ugyldige filtypenavne. Vælg kun %s'
+		'KickAssets.INVALIDEXTENSIONSSELECTED': 'Du har valgt nogle filer med ugyldige filtypenavne. Vælg kun %s',
+		'KickAssets.NOFILESELECTED': 'Du har ikke valgt nogen fil.'
 	});
 }
diff --git a/lang/de.js b/lang/de.js
@@ -48,6 +48,7 @@ else {
 		'KickAssets.DONE': 'Fertig',
 		'KickAssets.TOOMANYSELECTED': 'Die haben zu viele Objekte ausgewählt. Bitte nicht mehr %s auswählen.',
 		'KickAssets.INVALIDTYPESSELECTED': 'Sie haben ungültige Objekte ausgewählt. Bitte nur %s auswählen.',
-		'KickAssets.INVALIDEXTENSIONSSELECTED': 'Sie haben Dateien mit ungültiger Dateienamenrweiterung ausgewählt. Bitte nur %s auswählen.'
+		'KickAssets.INVALIDEXTENSIONSSELECTED': 'Sie haben Dateien mit ungültiger Dateienamenrweiterung ausgewählt. Bitte nur %s auswählen.',
+		'KickAssets.NOFILESELECTED': 'Sie haben keine Datei ausgewählt.'
 	});
 }