Merge pull request #226 from qld-gov-au/QOLSVC-10616-ckan-2.11.3-appearance

[QOLSVC-10616] revert resource edit button to previous appearance

Author: ThrawnCA

changes/8744.misc

@@ -0,0 +1,4 @@
+Update CICD Infrastructure
+* Swap Code Coverage tool coveralls.io for codecov.io
+* Generate combined pytest report and coverage report's
+* Build Documentation and product doc's artifact

ckan/i18n/en_AU/LC_MESSAGES/ckan.po

@@ -3304,7 +3304,7 @@ msgstr "username"
 
 #: ckan/templates/user/new_user_form.html:11
 msgid "Full Name"
-msgstr "Displayed name"
+msgstr "Displayed Name"
 
 #: ckan/templates/user/new_user_form.html:37
 msgid "Create Account"

ckan/logic/action/update.py

@@ -306,8 +306,8 @@ def package_update(
         model.Session.rollback()
         raise ValidationError(errors)
 
-    #avoid revisioning by updating directly
     if not resources_only:
+        #avoid revisioning by updating directly
         model.Session.query(model.Package).filter_by(id=pkg.id).update(
             {"metadata_modified": datetime.datetime.utcnow()})
         model.Session.refresh(pkg)

ckan/templates/package/resource_read.html

@@ -29,7 +29,7 @@
               {% block resource_actions_inner %}
                 {% block action_manage %}
                   {% if h.check_access('package_update', {'id':pkg.id }) %}
-                    <li>{% link_for _('Edit resource'), named_route=pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='pencil' %}</li>
+                    <li>{% link_for _('Manage'), named_route=pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='wrench' %}</li>
                     {% block action_manage_inner %}{% endblock %}
                     <li>{% link_for _('Views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='chart-bar' %}</li>
                   {% endif %}

test-core-ci.ini

@@ -1,4 +1,4 @@
-# This is the ini file used in the GitHub Actions workflow and the 
+# This is the ini file used in the GitHub Actions workflow and the
 # docker compose setup located in `test-infrastructure` that takes into
 # account the different host names for the various services CKAN connects to