Fixed #77 to get the license from 'license_text_file' if component doesn't have 'dje_license'

Author: chinyeungli

about_code_tool/about.py

@@ -940,6 +940,17 @@ def dje_license(self):
 
         return ""  # Returns empty string if the dje_license key does not exist
 
+    def get_license_text_file_name(self):
+        """
+        Return the license_text_file name if the license_text_file field exists
+        """
+        try:
+            return self.parsed['license_text_file']
+        except Exception as e:
+            pass
+
+        return ""  # Returns empty string if the license_text_file key does not exist
+
 class AboutCollector(object):
     """
     A collection of AboutFile instances.
@@ -1086,10 +1097,16 @@ def generate_attribution(self, template_path='templates/default.html',
             if not limit_to or about_object.about_resource_path in limit_to:
                 validated_fields.append(about_object.validated_fields)
                 notice_text.append(about_object.notice_text())
-                if not about_object.dje_license() in unique_license \
-                    and not about_object.dje_license() == None:
-                    unique_license.append(about_object.dje_license())
-                    license_text.append(about_object.license_text())
+                if about_object.dje_license():
+                    if not about_object.dje_license() in unique_license \
+                        and not about_object.dje_license() == None:
+                        unique_license.append(about_object.dje_license())
+                        license_text.append(about_object.license_text())
+                elif about_object.get_license_text_file_name():
+                    if not about_object.get_license_text_file_name() in unique_license \
+                        and about_object.license_text():
+                        unique_license.append(about_object.get_license_text_file_name())
+                        license_text.append(about_object.license_text())
 
         return template.render(about_objects=validated_fields,
                                license_texts=license_text,

about_code_tool/templates/default.html

@@ -53,12 +53,18 @@ <h3 class="component-name">{{ about_object.name }}{% if about_object.version %}
                 {% elif about_object.notice_file %}
                     <pre class="component-notice">{{ notice_texts[loop.index0] }}</pre>
                 {% endif %}
-                {% if about_object.dje_license %} 
+                {% if about_object.dje_license in unique_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>
+                {% elif about_object.license_text_file in unique_licenses %}
+                    <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>
                 {% endif %}
             </div>
         {% endfor %}