Bug fixes

keitaroinc · Jul 31, 2024 · 2b579e9 · 2b579e9
1 parent 882d289
commit 2b579e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/ckanext/bulkupload/templates/package/package_busoperator.html b/ckanext/bulkupload/templates/package/package_busoperator.html
@@ -6,7 +6,7 @@
 
 <p> </p>
 {% if request.args.get('errors') %}
-  <p class="text-danger">That dataset name already exists</p>
+  <p class="text-danger">Please fill the dataset title</title></p>
 {% endif %}
 <form id="bulk_upload_form" method="post" enctype="multipart/form-data">
     {{ form.input('title', id='field-dataset-title', label=_('Dataset Title'), value="", error="", placeholder='e.g. TransX data') }}

diff --git a/ckanext/bulkupload/templates/package/resource_busoperator.html b/ckanext/bulkupload/templates/package/resource_busoperator.html
@@ -4,21 +4,24 @@
 {% block primary_content %}
 <p> </p>
   {% block form %}
-  <form  id="bulk_upload_form" method="post" enctype="multipart/form-data">
+  <form id="bulk_upload_form" method="post" enctype="multipart/form-data">
     {{ form.input('title', id='field-dataset-title', label=_('Dataset Title'), value=pkg_dict.title, error="", placeholder='eg. TransX data') }}
       <div style="margin:-20px 0px 20px 0px;"><small>{{ form.info('The name of the dataset') }}</small></div>  
       {{ form.input('date-start', type='date', id='field-date-start',  label=_('Date start'), value=pkg_dict.dataset_start_date, error='') }}
       <div style="margin:-20px 0px 20px 0px;"><small>{{ form.info('Date start') }}</small></div>
       {{ form.input('date-end', type='date', id='field-date-end',  label=_('Date end'), value=pkg_dict.dataset_end_date, error='') }}
-      <div style="margin:-20px 0px 20px 0px;"><small>{{ form.info('Date end') }}</small></div> 
-      {{ form.input('organization', id='field-organization',  label=_('Organization'), value=pkg_dict.organization.title, error='') }}
-      <div style="margin:-20px 0px 20px 0px;"><small>{{ form.info('Organiation') }}</small></div> 
-
-      <strong class="text-success">Dataset Created. Please upload the file</strong>
+      <div style="margin:-20px 0px 20px 0px;"><small>{{ form.info('Date end') }}</small></div>
+      <div>
+        <label for="field-organization">{{ _('Organization') }}</label>
+        <input type="text" id="field-organization" name="organization" value="{{ pkg_dict.organization.title }}" disabled>
+      </div>
+      <div style="margin-bottom: 40px;">
+        <strong class="text-success">Dataset Created. Please upload the file</strong>
+      </div>
 
       <div style="margin-bottom: 20px;"><input class ='btn btn-default' type="file" name="file[]"></div>
       <div style="display:flex; gap:10px">
-        <button type='submit', class ='btn btn-primary', icon='plus-square'>{{_('Upload')}}</button>
+        <button type='submit' class ='btn btn-primary' icon='plus-square'>{{_('Upload')}}</button>
       </div>
     </form>
   {% endblock %}