Merge pull request #1552 from RyanThompson/feature/initial_folder_con…

…tents

Feature/initial folder contents

system/cms/modules/files/controllers/admin.php

@@ -104,6 +104,18 @@ public function new_folder()
 		echo json_encode($result);
 	}
 
+	/**
+	 * Set the initial folder ID to load contents for
+	 *
+	 * Accepts the parent id and sets it as flash data
+	 */
+	public function initial_folder_contents($id)
+	{
+		$this->session->set_flashdata('initial_folder_contents', $id);
+
+		redirect(site_url('admin/files'));
+	}
+
 	/**
 	 * Get all files and folders within a folder
 	 *

system/cms/modules/files/views/admin/index.php

@@ -134,4 +134,14 @@
 		</ul>
 	</div>
 
-</section>
+</section>
+
+<?php if ( $this->session->flashdata('initial_folder_contents') ): ?>
+<script type="text/javascript">
+	$(document).ready(function(){
+
+		// Load the flash data ID
+		setTimeout(function(){pyro.files.folder_contents(<?php echo $this->session->flashdata('initial_folder_contents'); ?>);}, '1000');
+	});
+</script>
+<?php endif; ?>