minor: ContentFolderShowTemplate constructor

Author: angrynode

src/routes/content_folder.rs

@@ -30,7 +30,7 @@ pub struct ContentFolderShowTemplate {
     /// Global application state
     pub state: AppStateContext,
     /// current folder
-    pub current_content_folder: content_folder::Model,
+    pub folder: content_folder::Model,
     /// Folders with parent_id set to current folder
     pub children: Vec<FileSystemEntry>,
     /// Category
@@ -41,6 +41,26 @@ pub struct ContentFolderShowTemplate {
     pub flash: Option<OperationStatus>,
 }
 
+impl ContentFolderShowTemplate {
+    fn new(context: AppStateContext, folder: FolderRequest) -> Self {
+        let FolderRequest {
+            breadcrumbs,
+            category,
+            children,
+            folder,
+        } = folder;
+
+        Self {
+            breadcrumbs,
+            category,
+            children,
+            flash: None,
+            folder,
+            state: context,
+        }
+    }
+}
+
 impl FallibleTemplate for ContentFolderShowTemplate {
     fn with_optional_flash(&mut self, flash: Option<OperationStatus>) {
         self.flash = flash;
@@ -52,14 +72,7 @@ pub async fn show(
     folder: FolderRequest,
     status: StatusCookie,
 ) -> FlashTemplate<ContentFolderShowTemplate> {
-    status.with_template(ContentFolderShowTemplate {
-        breadcrumbs: folder.breadcrumbs,
-        children: folder.children,
-        current_content_folder: folder.folder,
-        category: folder.category,
-        state: context,
-        flash: None,
-    })
+    status.with_template(ContentFolderShowTemplate::new(context, folder))
 }
 
 pub async fn create(

templates/content_folders/show.html

@@ -1,7 +1,7 @@
 {% extends "layouts/file_system_base.html" %}
 
 {% block folder_title %}
-  {{ current_content_folder.name }}
+  {{ folder.name }}
 {% endblock%}
 
 {% block actions_buttons %}
@@ -22,7 +22,7 @@
     </div> 
 
     <input type="hidden" id="category_id" name="category_id" value="{{ category.id }}" />
-    <input type="hidden" id="parent_id" name="parent_id" value="{{ current_content_folder.id }}" />
+    <input type="hidden" id="parent_id" name="parent_id" value="{{ folder.id }}" />
     <input type="hidden" id="path" name="path" value="fake_path" />
 
     <div class="text-center mt-4">