Procházet zdrojové kódy

Fix blank page on new packages and other minor issues

Jordi Boggiano před 9 roky
rodič
revize
d40bf71e52

+ 8 - 7
src/Packagist/WebBundle/Controller/WebController.php

@@ -651,6 +651,7 @@ class WebController extends Controller
         }
 
         $version = null;
+        $expandedVersion = null;
         $versions = $package->getVersions();
         if (is_object($versions)) {
             $versions = $versions->toArray();
@@ -674,16 +675,16 @@ class WebController extends Controller
         if (count($versions)) {
             $versionRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
             $version = $versionRepo->getFullVersion(reset($versions)->getId());
-        }
 
-        $expandedVersion = reset($versions);
-        foreach ($versions as $v) {
-            if (!$v->isDevelopment()) {
-                $expandedVersion = $v;
-                break;
+            $expandedVersion = reset($versions);
+            foreach ($versions as $v) {
+                if (!$v->isDevelopment()) {
+                    $expandedVersion = $v;
+                    break;
+                }
             }
+            $expandedVersion = $versionRepo->getFullVersion($expandedVersion->getId());
         }
-        $expandedVersion = $versionRepo->getFullVersion($expandedVersion->getId());
 
         $data = array(
             'package' => $package,

+ 3 - 3
src/Packagist/WebBundle/Resources/public/css/main.css

@@ -694,7 +694,7 @@ ul.packages .metadata-block:last-child {
     font-size: 12px;
 }
 
-.btn.loading {
+.btn.loading, .btn.loading:hover, .btn.loading:active {
     background-image: url("../img/loader.gif");
     background-position: 95% 50%;
     background-repeat: no-repeat;
@@ -708,7 +708,7 @@ ul.packages .metadata-block:last-child {
 }
 .btn-default:focus, .btn-default:active {
   color: #fff;
-  background-color: #a5aab0;
+  background: #a5aab0;
   border-bottom-color: #bbbfc4;
 }
 
@@ -850,7 +850,7 @@ ul.packages .metadata-block:last-child {
     margin-bottom: -1px !important;
     position: relative;
 }
-.package .action input.loading {
+.package .action input.loading, .package .action input.loading:hover, .package .action input.loading:active {
   background-position: 10px center;
   background-image: url("../img/loader.gif");
   background-repeat: no-repeat;

+ 3 - 1
src/Packagist/WebBundle/Resources/public/js/view.js

@@ -105,7 +105,9 @@
     });
     $('.package .delete').submit(function (e) {
         e.preventDefault();
-        e.target.submit();
+        if (window.confirm('Are you sure?')) {
+            e.target.submit();
+        }
     });
     $('.package .delete-version .submit').click(function (e) {
         e.preventDefault();

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

@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block scripts %}
-    <script src="{{ asset('bundles/packagistweb/js/view.js?v=14')}}"></script>
+    <script src="{{ asset('bundles/packagistweb/js/view.js?v=15')}}"></script>
 {% endblock %}
 
 {% block description -%}
@@ -39,7 +39,7 @@
 
             <div class="row">
                 <div class="col-md-8">
-                    <p class="requireme"><i class="glyphicon glyphicon-save"></i> <input type="text" readonly="readonly" value="composer require {{ "#{version.package.vendor}/#{version.package.packageName}" }}" /></p>
+                    <p class="requireme"><i class="glyphicon glyphicon-save"></i> <input type="text" readonly="readonly" value="composer require {{ "#{package.vendor}/#{package.packageName}" }}" /></p>
 
                     {% if not package.autoUpdated and app.user and (package.maintainers.contains(app.user) or is_granted('ROLE_UPDATE_PACKAGES')) %}
                         {% if "github.com" in package.repository %}

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

@@ -13,7 +13,7 @@
 
         <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" type="text/css" />
         <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap-theme.min.css">
-        <link rel="stylesheet" href="{{ asset('bundles/packagistweb/css/main.css?v=16') }}" />
+        <link rel="stylesheet" href="{{ asset('bundles/packagistweb/css/main.css?v=17') }}" />
         <link rel="stylesheet" href="{{ asset('css/humane/jackedup.css?v=4') }}" />
 
         {% block head_feeds %}