[smarcet] - #12809

* fix on ingestion

Author: smarcet

software/code/infrastructure/active_records/OpenStackRelease.php

@@ -251,14 +251,14 @@ public function addSupportedVersion(IOpenStackApiVersion $version, $status = "Cu
 
     /**
      * @param string $code_name
-     * @return bool
+     * @return OpenStackComponent|null
      */
     public function supportsComponent($code_name)
     {
-        $res = $this->getManyManyComponents('OpenStackComponents',
-            "OpenStackComponent.CodeName = '{$code_name}' ")->First();
-
-        return $res;
+        foreach(AssociationFactory::getInstance()->getMany2ManyAssociation($this, 'OpenStackComponents')->toArray() as $component){
+            if($component->CodeName == $code_name) return $component;
+        }
+        return null;
     }
 
     /**
@@ -407,11 +407,17 @@ public function getComponentById($component_id)
         return $this->OpenStackComponents()->filter(array( 'OpenStackComponentID' => $component_id))->first();
     }
 
-    public function getVersionLabel($component_id)
+    public function getCurrentSupportedApiVersionLabel($component_id)
     {
         $api = $this->SupportedApiVersions()
-            ->innerJoin('OpenStackApiVersion','OpenStackApiVersion.ID = OpenStackReleaseSupportedApiVersion.ApiVersionID')
-            ->filter('OpenStackComponentID', $component_id)->sort('OpenStackReleaseSupportedApiVersion.ReleaseVersion','DESC')->first();
+              ->innerJoin('OpenStackApiVersion','OpenStackApiVersion.ID = OpenStackReleaseSupportedApiVersion.ApiVersionID')
+              ->filter(
+                  [
+                      'OpenStackComponentID'                       => $component_id,
+                      'OpenStackReleaseSupportedApiVersion.Status' => 'Current'
+                  ]
+              )
+             ->first();
         if(is_null($api))
             return 'N/A';
         $res = $api->ReleaseVersion;

software/code/infrastructure/active_records/OpenStackReleaseSupportedApiVersion.php

@@ -25,7 +25,7 @@ class OpenStackReleaseSupportedApiVersion
     private static $db = array
     (
         'ReleaseVersion'     => 'Text',
-        'Status'             => "Enum('Deprecated, Supported, Current, Beta, Alpha' , 'Deprecated')",
+        'Status'             => "Enum('Deprecated, Supported, Current, Beta, Alpha' , 'Current')",
         'CreatedFromTask'    => 'Boolean',
     );
 

software/templates/Layout/SoftwareHomePage_getComponent.ss

@@ -354,7 +354,7 @@
                         <% loop Releases %>
                             <li <% if $Status == Current %>class="timeline-current"<% end_if %><% if $Status == Future %>class="timeline-future"<% end_if %>>
                                 <a href="https://releases.openstack.org/{$Slug}/index.html#{$Slug}-{$Top.Component.Slug}" target="_blank">
-                                    <%t Software.VERSION 'Version' %> {$getVersionLabel($Top.Component.ID)} ({$Name}) <% if $Status == Current %>- LATEST RELEASE<% end_if %>
+                                    <%t Software.VERSION 'Version' %> {$getCurrentSupportedApiVersionLabel($Top.Component.ID)} ({$Name}) <% if $Status == Current %>- LATEST RELEASE<% end_if %>
                                 </a>
                             </li>
                         <% end_loop %>