Merge branch 'hotfix/fixes-410-missing-setting-tab' into 'hotfix/UI/s…

…elect-all-only-filtered'


Fixes missing tab issue

Fixes missing tab for settings when viewing the export page.

See merge request !834

CHANGELOG.md

@@ -3,8 +3,9 @@ Changes
 
 0.13.0 to 0.14.0
 ----------------
-* [UI]: Fixed bug preventing sample selection while filtered by file. (0.13.2)
 * [UI]: Added ability to select or deselect viewing all associated projects. (0.13.1)
+* [UI]: Fixed issue with missing settings tab when in export view within a Project. (0.13.2)
+* [UI]: Fixed bug preventing sample selection while filtered by file. (0.13.2)
 
 0.12.0 to 0.13.0
 ----------------

src/main/java/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectExportController.java

@@ -71,6 +71,7 @@ public class ProjectExportController {
 	@Value("${ncbi.upload.namespace}")
 	private String namespace = "";
 
+	private final ProjectControllerUtils projectControllerUtils;
 	private final ProjectService projectService;
 	private final SampleService sampleService;
 	private final SequencingObjectService sequencingObjectService;
@@ -79,10 +80,12 @@ public class ProjectExportController {
 
 	@Autowired
 	public ProjectExportController(ProjectService projectService, SampleService sampleService,
+			ProjectControllerUtils projectControllerUtils,
 			SequencingObjectService sequencingObjectService, NcbiExportSubmissionService exportSubmissionService,
 			UserService userService) {
 		this.projectService = projectService;
 		this.sampleService = sampleService;
+		this.projectControllerUtils = projectControllerUtils;
 		this.sequencingObjectService = sequencingObjectService;
 		this.exportSubmissionService = exportSubmissionService;
 		this.userService = userService;
@@ -267,8 +270,10 @@ public String getDetailsView(@PathVariable Long projectId, @PathVariable Long su
 	 * @return name of the exports list view
 	 */
 	@RequestMapping("/projects/{projectId}/export")
-	public String getExportsPage(@PathVariable Long projectId, Model model) {
+	public String getExportsPage(@PathVariable Long projectId, Model model, Principal principal) {
 		Project project = projectService.read(projectId);
+		// Set up the template information
+		projectControllerUtils.getProjectTemplateDetails(model, principal, project);
 		model.addAttribute("project", project);
 		model.addAttribute("activeNav", "export");
 		return EXPORT_LIST_VIEW;