Minor bug fixes

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

src/attributecode/gen.py

@@ -150,7 +150,8 @@ def load_inventory(mapping, location, base_dir, license_notice_text_location=Non
             loc = posixpath.join(base_dir, afp)
         about = model.About(about_file_path=afp)
         about.location = loc
-        ld_errors = about.load_dict(fields, base_dir, license_notice_text_location, with_empty=False)
+        running_inventory = False
+        ld_errors = about.load_dict(fields, base_dir, running_inventory, license_notice_text_location, with_empty=False)
         # 'about_resource' field will be generated during the process.
         # No error need to be raise for the missing 'about_resource'.
         for e in ld_errors:

src/attributecode/templates/default_html.template

@@ -30,9 +30,9 @@
             <h3 class="component-name">{{ about_object.name.value }}
                 {% if about_object.version.value %}{{ about_object.version.value }}{% endif %}
             </h3>
-            {% if about_object.license.value %}
+            {% if about_object.license_expression.value %}
                 <p>This component is licensed under 
-                {{ about_object.license.value }}
+                {{ about_object.license_expression.value }}
             {% endif %}
             {% if about_object.copyright.value %}
                 <pre>{{about_object.copyright.value}}</pre>
@@ -43,7 +43,7 @@
                 {% endfor %}
             {% endif %}
             {% if about_object.license.value %}
-                {% for license_key in about_object.license.value.split() %}
+                {% for license_key in about_object.license.value %}
                     {% if license_key in common_licenses %}
                         <p>Full text of
                             <a class="{{ license_key }}" href="#component-license-{{ license_key }}">