README.md

@@ -291,4 +291,3 @@ Contributors
 * Marion Sanchez
 * Marjorie Da Silva
 * Mélanie Chanat
-* Showfom

app/bootstrap.php.d/30-trans.php

@@ -11,7 +11,7 @@ use Symfony\Component\HttpFoundation\Cookie;
 $app->register(new TranslationServiceProvider(), array(
     'locale' => 'en',
     'locale_fallback' => 'en',
-    'locales' => array('en', 'fr', 'es', 'de', 'cn'),
+    'locales' => array('en', 'fr', 'es', 'de'),
 ));
 
 $app['translator'] = $app->extend('translator', function ($translator, $app) {

app/bootstrap.php.d/50-git.php

@@ -6,7 +6,7 @@ use Gist\Service\Gist;
 $dataPath = $app['settings']['data']['path'];
 
 if ($dataPath[0] !== '/') {
-    $app['gist_path'] = $app['root_path'].'/'.$dataPath;
+    $app['gist_path'] = $app['root_path'].$dataPath;
 } else {
     $app['gist_path'] = $dataPath;
 }

app/bootstrap.php.d/60-api.php

@@ -3,5 +3,5 @@
 use Gist\Api\Client;
 
 $app['api_client'] = $app->share(function ($app) {
-    return new Client(['base_uri' => rtrim($app['settings']['api']['base_url'], '/')]);
+    return new Client(['base_uri' => $app['settings']['api']['base_uri']]);
 });

src/Gist/Controller/EditController.php

@@ -8,7 +8,6 @@ use Gist\Form\CloneGistForm;
 use Gist\Model\Gist;
 use GitWrapper\GitException;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\Form\FormError;
 
 /**
  * Class EditController.
@@ -38,19 +37,9 @@ class EditController extends Controller
 
         if ($request->isMethod('post')) {
             $form->submit($request);
-            $data = $form->getData();
-
-            if (empty($form->getData()['content']) && !$request->files->has('file')) {
-                $form->get('content')->addError(new FormError($app['translator']->trans('form.error.not_blank')));
-            } elseif (empty($form->getData()['content']) && $request->files->has('file')) {
-                if (count($form->get('file')->getErrors()) === 0) {
-                    $data['content'] = file_get_contents($form->get('file')->getData()->getPathName());
-                    unset($data['file']);
-                }
-            }
 
             if ($form->isValid()) {
-                $gist = $app['gist']->create(new Gist(), $data, $this->getUser());
+                $gist = $app['gist']->create(new Gist(), $form->getData(), $this->getUser());
             }
         }
 

src/Gist/Form/CreateGistForm.php

@@ -32,25 +32,16 @@ class CreateGistForm extends AbstractForm
             'content',
             'textarea',
             array(
-                'required' => false,
+                'required' => true,
                 'attr' => array(
                     'class' => 'form-control',
                     'rows' => 10,
                 ),
                 'trim' => false,
                 'constraints' => array(
-                ),
-            )
-        );
-
-        $this->builder->add(
-            'file',
-            'file',
-            array(
-                'required' => false,
-                'attr' => array(
-                ),
-                'constraints' => array(
+                    new NotBlank(array(
+                        'message' => $this->translator->trans('form.error.not_blank'),
+                    )),
                 ),
             )
         );

src/Gist/Resources/views/Edit/index.html.twig

@@ -4,7 +4,7 @@
 
 {% block body %}
     <div class="row">
-        <form action="{{ path('home') }}" method="post" id="main-form" enctype="multipart/form-data">
+        <form action="{{ path('home') }}" method="post" id="main-form">
             <div class="col-md-12">
                 <div class="panel panel-default">
                     <div class="panel-heading">
@@ -71,10 +71,6 @@
                             {{ form_errors(form.content) }}
                             {{ form_widget(form.content) }}
                         </p>
-                        <p>
-                            {{ form_errors(form.file) }}
-                            {{ form_widget(form.file) }}
-                        </p>
                         <p>
                             <input type="submit" class="btn btn-primary" value="{{ 'form.submit'|trans }}">
                         </p>

src/Gist/Resources/views/base.html.twig

@@ -79,7 +79,7 @@
                         </ul>
                         {% block langs %}
                             <p class="navbar-text navbar-right">
-                                {% for locale, flag in {'en': 'gb', 'fr': 'fr', 'es': 'es', 'de': 'de', 'cn': 'cn'} %}
+                                {% for locale, flag in {'en': 'gb', 'fr': 'fr', 'es': 'es', 'de': 'de'} %}
                                     <a class="lang btn btn-xs cipher-link" href="{{ path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')|merge({_locale: locale})) }}">
                                         <span class="flag-icon flag-icon-{{ flag }}"></span>
                                     </a>