@@ -, +, @@ --- api/v1/swagger/definitions.json | 8 +- .../definitions/import-batch-profiles.json | 6 - ...profile.json => import_batch_profile.json} | 0 .../definitions/import_batch_profiles.json | 6 + api/v1/swagger/parameters.json | 2 +- ...profile.json => import_batch_profile.json} | 0 api/v1/swagger/paths.json | 8 +- ...ofiles.json => import_batch_profiles.json} | 10 +- .../en/modules/tools/stage-marc-import.tt | 105 ++++-------------- 9 files changed, 42 insertions(+), 103 deletions(-) delete mode 100644 api/v1/swagger/definitions/import-batch-profiles.json rename api/v1/swagger/definitions/{import-batch-profile.json => import_batch_profile.json} (100%) create mode 100644 api/v1/swagger/definitions/import_batch_profiles.json rename api/v1/swagger/parameters/{import-batch-profile.json => import_batch_profile.json} (100%) rename api/v1/swagger/paths/{import-batch-profiles.json => import_batch_profiles.json} (97%) --- a/api/v1/swagger/definitions.json +++ a/api/v1/swagger/definitions.json @@ -38,11 +38,11 @@ "ill_backend": { "$ref": "definitions/ill_backend.json" }, - "import-batch-profile": { - "$ref": "definitions/import-batch-profile.json" + "import_batch_profile": { + "$ref": "definitions/import_batch_profile.json" }, - "import-batch-profiles": { - "$ref": "definitions/import-batch-profiles.json" + "import_batch_profiles": { + "$ref": "definitions/import_batch_profiles.json" }, "library": { "$ref": "definitions/library.json" --- a/api/v1/swagger/definitions/import-batch-profiles.json +++ a/api/v1/swagger/definitions/import-batch-profiles.json @@ -1,6 +0,0 @@ -{ - "type": "array", - "items": { - "$ref": "import-batch-profile.json" - } - } --- a/api/v1/swagger/definitions/import_batch_profiles.json +++ a/api/v1/swagger/definitions/import_batch_profiles.json @@ -0,0 +1,6 @@ +{ + "type": "array", + "items": { + "$ref": "import_batch_profile.json" + } + } --- a/api/v1/swagger/parameters.json +++ a/api/v1/swagger/parameters.json @@ -12,7 +12,7 @@ "$ref": "parameters/patron.json#/patron_id_qp" }, "profile_id_pp": { - "$ref": "parameters/import-batch-profile.json#/profile_id_pp" + "$ref": "parameters/import_batch_profile.json#/profile_id_pp" }, "city_id_pp": { "$ref": "parameters/city.json#/city_id_pp" --- a/api/v1/swagger/paths.json +++ a/api/v1/swagger/paths.json @@ -110,11 +110,11 @@ "/illrequests": { "$ref": "paths/illrequests.json#/~1illrequests" }, - "/import-batch-profiles": { - "$ref": "paths/import-batch-profiles.json#/~1import-batch-profiles" + "/import_batch_profiles": { + "$ref": "paths/import_batch_profiles.json#/~1import_batch_profiles" }, - "/import-batch-profiles/{profile_id}": { - "$ref": "paths/import-batch-profiles.json#/~1import-batch-profiles~1{profile_id}" + "/import_batch_profiles/{profile_id}": { + "$ref": "paths/import_batch_profiles.json#/~1import_batch_profiles~1{profile_id}" }, "/rotas/{rota_id}/stages/{stage_id}/position": { "$ref": "paths/rotas.json#/~1rotas~1{rota_id}~1stages~1{stage_id}~1position" --- a/api/v1/swagger/paths/import-batch-profiles.json +++ a/api/v1/swagger/paths/import-batch-profiles.json @@ -1,5 +1,5 @@ { - "/import-batch-profiles": { + "/import_batch_profiles": { "get": { "x-mojo-to": "ImportBatchProfiles#list", "operationId": "listImportBatchProfiles", @@ -37,7 +37,7 @@ "200": { "description": "A list of import batch profiles", "schema": { - "$ref": "../definitions.json#/import-batch-profiles" + "$ref": "../definitions.json#/import_batch_profiles" } }, "401": { @@ -140,7 +140,7 @@ "201": { "description": "Created Profile", "schema": { - "$ref": "../definitions.json#/import-batch-profile" + "$ref": "../definitions.json#/import_batch_profile" } }, "400": { @@ -187,7 +187,7 @@ } } }, - "/import-batch-profiles/{profile_id}": { + "/import_batch_profiles/{profile_id}": { "put": { "x-mojo-to": "ImportBatchProfiles#edit", "operationId": "editImportBatchProfiles", @@ -260,7 +260,7 @@ "200": { "description": "Updated profile", "schema": { - "$ref": "../definitions.json#/import-batch-profile" + "$ref": "../definitions.json#/import_batch_profile" } }, "400": { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt @@ -103,18 +103,10 @@ - -
  • - - - +
    When you select a profile it pre-fills your form with profile values.
    +
    Later you can modify your form and that's what matters on import.
  • -
    - - - -
    @@ -216,7 +208,12 @@ -
    +
    + + + + +
    Job progress:
    0%
    @@ -241,6 +238,8 @@ [% Asset.js("js/file-upload.js") | $raw %]