Merge branch 'develop' into 86_genattrib_text_update

Author: chinyeungli

about_code_tool/about.py

@@ -1097,6 +1097,7 @@ def generate_attribution(self, template_path='templates/default.html',
         license_key = []
         license_text = []
         license_dict = {}
+        common_license = ['GPL 2.0','OpenSSL/SSLeay License', 'Apache License 2.0', 'BSD-Modified']
         for about_object in self:
             about_relative_path = '/'+ about_object.location.partition(self.user_provided_path)[2]
             if not limit_to or about_relative_path in limit_to:
@@ -1140,7 +1141,9 @@ def generate_attribution(self, template_path='templates/default.html',
         return template.render(about_objects=validated_fields,
                                license_keys=license_key,
                                license_texts = license_text,
-                               notice_texts=notice_text)
+                               notice_texts=notice_text,
+                               license_dicts=license_dict,
+                               common_licenses=common_license)
 
     def get_genattrib_errors(self):
         return self.genattrib_errors

about_code_tool/templates/default.html

@@ -50,6 +50,9 @@ <h1>OPEN SOURCE SOFTWARE INFORMATION</h1>
                 <h3 class="component-name">{{ about_object.name }}
                     {% if about_object.version %}{{ about_object.version }}{% endif %}
                 </h3>
+                {% if about_object.dje_license in license_dicts.keys() %} 
+                    <p>This component is licensed under {{about_object.dje_license }}.
+                {% endif %}
                 {% if about_object.copyright %}
                     <pre>{{about_object.copyright}}</pre>
                 {% endif %}
@@ -58,30 +61,41 @@ <h3 class="component-name">{{ about_object.name }}
                 {% elif about_object.notice_file %}
                     <pre class="component-notice">{{ notice_texts[loop.index0] }}</pre>
                 {% endif %}
-                {% if about_object.dje_license in license_keys %} 
-                    <p>
-                        This component is licensed under {{ about_object.dje_license }}.
-                    </p>
-                    <p>Full text of
-                        <a class="{{ about_object.dje_license }}" href="#component-license-{{ about_object.dje_license }}">
-                         {{ about_object.dje_license }}
-                         </a>
-                            is available at the end of this document.</p>
-                {% elif about_object.license_text_file in license_keys %}
-                    <p>Full text of
-                        <a class="{{ about_object.license_text_file }}" href="#component-license-{{ about_object.license_text_file }}">
-                         {{ about_object.license_text_file }}
-                         </a>
-                            is available at the end of this document.</p>
+
+                {% if about_object.dje_license in license_dicts.keys() %}
+                    {% if about_object.dje_license in common_licenses %}
+                        <p>Full text of
+                            <a class="{{ about_object.dje_license }}" href="#component-license-{{ about_object.dje_license }}">
+                             {{ about_object.dje_license }}
+                             </a>
+                                is available at the end of this document.</p>
+                    {% else %}
+                        <pre>{{ license_dicts[about_object.dje_license] }}</pre>
+                    {% endif %}
+                {% elif about_object.license_text_file in license_dicts.keys() %}
+                    {% if about_object.dje_license in common_licenses %}
+                        <p>
+                            This component is licensed under {{ about_object.dje_license }}.
+                        </p>
+                        <p>Full text of
+                            <a class="{{ about_object.license_text_file }}" href="#component-license-{{ about_object.license_text_file }}">
+                             {{ about_object.license_text_file }}
+                             </a>
+                                is available at the end of this document.</p>
+                    {% else %}
+                        <pre>{{ license_dicts[about_object.license_text_file] }}</pre>
+                    {% endif %}
                 {% endif %}
             </div>
         {% endfor %}
         <hr>
 
         <h3>Licenses Used in This Product</h3>
         {% for index in range(license_keys | count) %}
-            <h3 id="component-license-{{ license_keys[index] }}">{{ license_keys[index] }}</h3>
-            <pre>{{ license_texts[index] }}</pre>
+            {% if license_keys[index] in common_licenses %}
+                <h3 id="component-license-{{ license_keys[index] }}">{{ license_keys[index] }}</h3>
+                <pre>{{ license_texts[index] }}</pre>
+            {% endif %}
         {% endfor %}
         <h3><a id="End">End</a></h3>
     </body>