From 3da4144c1b42272ecf4f6b6e99a7f70910cf7afc Mon Sep 17 00:00:00 2001
From: Harvey Kandola <harvey@documize.com>
Date: Tue, 15 Jan 2019 20:15:12 +0000
Subject: [PATCH] Set correct model for space clone options

---
 gui/app/pods/document/index/controller.js                 | 1 +
 gui/app/pods/folders/route.js                             | 3 ++-
 gui/app/pods/folders/template.hbs                         | 2 +-
 gui/app/styles/core/view/document/sidebar-attachment.scss | 6 ++++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gui/app/pods/document/index/controller.js b/gui/app/pods/document/index/controller.js
index dfcd4d52..9406149a 100644
--- a/gui/app/pods/document/index/controller.js
+++ b/gui/app/pods/document/index/controller.js
@@ -19,6 +19,7 @@ export default Controller.extend(Notifier, {
 	templateService: service('template'),
 	sectionService: service('section'),
 	linkService: service('link'),
+	appMeta: service(),
 	router: service(),
 	sidebarTab: 'toc',
 	queryParams: ['currentPageId', 'source'],
diff --git a/gui/app/pods/folders/route.js b/gui/app/pods/folders/route.js
index 60806942..11f8ba8f 100644
--- a/gui/app/pods/folders/route.js
+++ b/gui/app/pods/folders/route.js
@@ -38,6 +38,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
 	setupController(controller, model) {
 		this._super(controller, model);
 		controller.set('selectedSpaces', model.spaces);
+		controller.set('selectedView', 'all');
 
 		let constants = this.get('constants');
 		let publicSpaces = [];
@@ -62,8 +63,8 @@ export default Route.extend(AuthenticatedRouteMixin, {
 			controller.set(label.get('id'), spaces);
 		});
 
+		controller.set('spaces', model.spaces);
 		controller.set('labels', model.labels);
-		controller.set('spaces', publicSpaces);
 		controller.set('publicSpaces', publicSpaces);
 		controller.set('protectedSpaces', protectedSpaces);
 		controller.set('personalSpaces', personalSpaces);
diff --git a/gui/app/pods/folders/template.hbs b/gui/app/pods/folders/template.hbs
index 6f904d17..a43a3278 100644
--- a/gui/app/pods/folders/template.hbs
+++ b/gui/app/pods/folders/template.hbs
@@ -116,7 +116,7 @@
 
 						<div class="form-group">
 							<label for="clone-space-dropdown">Clone Space</label>
-							{{ui/ui-select id="clone-space-dropdown" content=model prompt="select space" action=(action "onCloneSpaceSelect") optionValuePath="id" optionLabelPath="name" selection=clonedSpace}}
+							{{ui/ui-select id="clone-space-dropdown" content=spaces prompt="select space" action=(action "onCloneSpaceSelect") optionValuePath="id" optionLabelPath="name" selection=clonedSpace}}
 							<small id="emailHelp" class="form-text text-muted">Copy templates, permissions, documents from existing space</small>
 							<div class="margin-top-10" />
 							{{#if hasClone}}
diff --git a/gui/app/styles/core/view/document/sidebar-attachment.scss b/gui/app/styles/core/view/document/sidebar-attachment.scss
index b6d2f2c1..0c313264 100644
--- a/gui/app/styles/core/view/document/sidebar-attachment.scss
+++ b/gui/app/styles/core/view/document/sidebar-attachment.scss
@@ -1,8 +1,10 @@
-.document-sidebar-attachment {
-	.dz-preview, .dz-processing {
+#upload-document-files {
+	> .dz-preview, .dz-processing {
 		display: none !important;
 	}
+}
 
+.document-sidebar-attachment {
 	> .files {
 		margin: 0;
 		padding: 0;