소스 검색

Fix delete version button so it appears when it should

Jordi Boggiano 12 년 전
부모
커밋
43eea1cb7e
2개의 변경된 파일6개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 0
      src/Packagist/WebBundle/Controller/WebController.php
  2. 1 1
      src/Packagist/WebBundle/Resources/views/Web/viewPackage.html.twig

+ 5 - 0
src/Packagist/WebBundle/Controller/WebController.php

@@ -497,6 +497,11 @@ class WebController extends Controller
         }
         if ($deleteForm = $this->createDeletePackageForm($package)) {
             $data['deleteForm'] = $deleteForm->createView();
+        }
+        if ($this->getUser() && (
+            $this->get('security.context')->isGranted('ROLE_DELETE_PACKAGES')
+            || $package->getMaintainers()->contains($this->getUser())
+        )) {
             $data['deleteVersionCsrfToken'] = $this->get('form.csrf_provider')->generateCsrfToken('delete_version');
         }
 

+ 1 - 1
src/Packagist/WebBundle/Resources/views/Web/viewPackage.html.twig

@@ -129,7 +129,7 @@
                                     <span class="source-reference">reference: {{ version.source.reference|prettify_source_reference }}</span>
                                     {% endif %}
 
-                                    {% if deleteForm is defined %}
+                                    {% if deleteVersionCsrfToken is defined %}
                                     <form class="action delete-version" action="{{ path("delete_version", {"versionId": version.id}) }}" method="post">
                                         <input type="hidden" name="_method" value="DELETE" />
                                         <input type="hidden" name="_token" value="{{ deleteVersionCsrfToken }}" />