Fixed #78

Using a dictionary, license_dict{} , to replace the 2 lists:
unique_license[]
license_text[]

Author: chinyeungli

about_code_tool/about.py

@@ -1093,20 +1093,18 @@ def generate_attribution(self, template_path='templates/default.html',
 
         # We only need the fields names and values to render the template
         validated_fields = []
-        license_text = []
         notice_text = []
-        unique_license = []
+        license_dict = {}
         for about_object in self:
             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())
                 dje_license_name = about_object.get_dje_license_name()
                 if dje_license_name:
-                    if not dje_license_name in unique_license \
+                    if not dje_license_name in license_dict \
                         and not dje_license_name == None:
                         if about_object.license_text():
-                            unique_license.append(about_object.get_dje_license_name())
-                            license_text.append(about_object.license_text())
+                            license_dict[about_object.get_dje_license_name()] = about_object.license_text()
                         else:
                             msg = 'About resource: %s - license_text does not exist.'\
                                 ' License generation is skipped.'\
@@ -1115,10 +1113,9 @@ def generate_attribution(self, template_path='templates/default.html',
                                                                'dje_license',\
                                                                dje_license_name, msg))
                 elif about_object.get_license_text_file_name():
-                    if not about_object.get_license_text_file_name() in unique_license:
+                    if not about_object.get_license_text_file_name() in license_dict:
                         if about_object.license_text():
-                            unique_license.append(about_object.get_license_text_file_name())
-                            license_text.append(about_object.license_text())
+                            license_dict[about_object.get_license_text_file_name()] = about_object.license_text()
                         else:
                             msg = 'About resource: %s - license_text does not exist.'\
                                 ' License generation is skipped.'\
@@ -1133,9 +1130,9 @@ def generate_attribution(self, template_path='templates/default.html',
                                                         msg))
 
         return template.render(about_objects=validated_fields,
-                               license_texts=license_text,
-                               notice_texts=notice_text,
-                               unique_licenses=unique_license)
+                               license_keys=list(license_dict.keys()),
+                               license_texts = list(license_dict.values()),
+                               notice_texts=notice_text)
 
     def get_genattrib_errors(self):
         return self.genattrib_errors

about_code_tool/templates/default.html

@@ -53,13 +53,13 @@ <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 in unique_licenses %} 
+                {% if about_object.dje_license in license_keys %} 
                     <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 %}
+                {% 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 }}
@@ -71,8 +71,8 @@ <h3 class="component-name">{{ about_object.name }}{% if about_object.version %}
         <hr>
 
         <h3>Licenses Used in This Product</h3>
-        {% for index in range(unique_licenses | count) %}
-            <h3 id="component-license-{{ unique_licenses[index] }}">{{ unique_licenses[index] }}</h3>
+        {% for index in range(license_keys | count) %}
+            <h3 id="component-license-{{ license_keys[index] }}">{{ license_keys[index] }}</h3>
             <pre>{{ license_texts[index] }}</pre>
         {% endfor %}
         <h3><a id="End">End</a></h3>