Adding MarkdownEditType, cancel action

Author: philipsorst

Controller/FileController.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Dontdrinkandroot\GitkiBundle\Controller;
 
 use Dontdrinkandroot\GitkiBundle\Exception\FileLockedException;
@@ -13,7 +12,6 @@
 
 class FileController extends BaseController
 {
-
     public function serveAction(Request $request, $path)
     {
         $this->assertWatcher();
@@ -146,6 +144,23 @@ public function moveAction(Request $request, $path)
         );
     }
 
+    /**
+     * Cancels editing.
+     *
+     * @param string $path
+     *
+     * @return Response
+     */
+    public function cancelAction($path)
+    {
+        $this->assertCommitter();
+        $filePath = FilePath::parse($path);
+        $user = $this->getGitUser();
+        $this->getWikiService()->removeLock($user, $filePath);
+
+        return $this->redirect($this->generateUrl('ddr_gitki_file', ['path' => $filePath]));
+    }
+
     /**
      * @param File $file
      *

Controller/MarkdownController.php

@@ -3,10 +3,10 @@
 namespace Dontdrinkandroot\GitkiBundle\Controller;
 
 use Dontdrinkandroot\GitkiBundle\Exception\FileLockedException;
+use Dontdrinkandroot\GitkiBundle\Form\Type\MarkdownEditType;
 use Dontdrinkandroot\GitkiBundle\Service\Markdown\MarkdownServiceInterface;
 use Dontdrinkandroot\Path\FilePath;
 use GitWrapper\GitException;
-use Symfony\Component\Form\SubmitButton;
 use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -96,37 +96,10 @@ public function editAction(Request $request, $path)
             return new Response($renderedView, Response::HTTP_LOCKED);
         }
 
-        $form = $this->createFormBuilder()
-            ->add('content', 'textarea', ['attr' => ['rows' => 15], 'label' => false])
-            ->add('commitMessage', 'text', ['label' => 'Commit Message', 'required' => true])
-            ->add(
-                'actions',
-                'form_actions',
-                [
-                    'buttons' => [
-                        'save'   => [
-                            'type'    => 'submit',
-                            'options' => ['label' => 'Save']
-                        ],
-                        'cancel' => [
-                            'type'    => 'submit',
-                            'options' => ['label' => 'Cancel', 'button_class' => 'default']
-                        ],
-                    ]
-                ]
-            )
-            ->getForm();
+        $form = $this->createForm(MarkdownEditType::class);
 
         $form->handleRequest($request);
 
-        /** @var SubmitButton $cancelButton */
-        $cancelButton = $form->get('actions')->get('cancel');
-        if ($cancelButton->isClicked()) {
-            $this->getWikiService()->removeLock($user, $filePath);
-
-            return $this->redirect($this->generateUrl('ddr_gitki_file', ['path' => $filePath]));
-        }
-
         if ($form->isValid()) {
             $content = $form->get('content')->getData();
             $commitMessage = $form->get('commitMessage')->getData();

Form/Type/MarkdownEditType.php

@@ -0,0 +1,20 @@
+<?php
+namespace Dontdrinkandroot\GitkiBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MarkdownEditType extends AbstractType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('content', TextareaType::class, ['attr' => ['rows' => 15], 'label' => false])
+            ->add('commitMessage', TextType::class, ['label' => 'Commit Message', 'required' => true]);
+    }
+}

Resources/config/services.yml

@@ -37,11 +37,12 @@ services:
             - [registerFileAction, ['DdrGitkiBundle:File:holdLock', 'holdlock']]
             - [registerFileAction, ['DdrGitkiBundle:File:history', 'history']]
             - [registerFileAction, ['DdrGitkiBundle:File:move', 'move']]
+            - [registerFileAction, ['DdrGitkiBundle:File:cancel', 'cancel']]
             - [registerFileAction, ['DdrGitkiBundle:Markdown:preview','preview','md']]
             - [registerDirectoryAction, ['DdrGitkiBundle:Directory:index']]
             - [registerDirectoryAction, ['DdrGitkiBundle:Directory:list', 'list']]
             - [registerDirectoryAction, ['DdrGitkiBundle:Directory:index', 'index']]
-            - [registerDirectoryAction, ['DdrGitkiBundle:Directory:createSubdirectory', 'subdirectory.create']]
+            - [registerDirectoryAction, ['DdrGitkiBundle:Directory:createSubdirectory','subdirectory.create']]
             - [registerDirectoryAction, ['DdrGitkiBundle:Directory:createFile', 'file.create']]
             - [registerDirectoryAction, ['DdrGitkiBundle:Directory:remove', 'remove']]
             - [registerDirectoryAction, ['DdrGitkiBundle:Directory:uploadFile', 'file.upload']]

Resources/views/Markdown/edit.html.twig

@@ -42,7 +42,11 @@
                         </button>
                     </div>
                 </div>
-                {{ form(form, { 'attr': {'class' : 'edit' }}) }}
+                {{ form_start(form, { 'attr': {'class' : 'edit' }}) }}
+                {{ form_rest(form) }}
+                <button type="submit" class="btn btn-primary">Save</button>
+                <a href="{{ path('ddr_gitki_file', {'path': path, 'action': 'cancel'}) }}" class="btn btn-default">Cancel</a>
+                {{ form_end(form) }}
             </div>
             <div class="col-md-6">
                 <div id="preview" class="markdown-page">

Service/ExtensionRegistry/ExtensionRegistry.php

@@ -1,13 +1,11 @@
 <?php
 
-
 namespace Dontdrinkandroot\GitkiBundle\Service\ExtensionRegistry;
 
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 
 class ExtensionRegistry implements ExtensionRegistryInterface
 {
-
     const ACTION_VIEW = '';
 
     const ACTION_EDIT = 'edit';

Service/ExtensionRegistry/ExtensionRegistryInterface.php

@@ -1,11 +1,9 @@
 <?php
 
-
 namespace Dontdrinkandroot\GitkiBundle\Service\ExtensionRegistry;
 
 interface ExtensionRegistryInterface
 {
-
     /**
      * @param string $extension
      *