Merge branch 'develop'

Author: boutros

CHANGELOG.md

@@ -13,6 +13,28 @@ The resulting compose file can then be used with `docker-compose up -d` to provi
 
 # Releases
 
+## 0.6.5 (2016-11-30)
+
+KOHA: 008a33634de04bda2287dd7fc8d89a53c7bc968d
+
+- koha:
+  - DEICH-488/DEICH-400: Fiks og forbedring av håndtering av kemnersaker
+  - DEICH-431: Sletting av fjerner også fra søkeindeks
+- patron-client:
+  - DEICH-423: Vis alle emner på verkssiden
+  - DEICH-467: Man kan nå endre henteavdeling på reservasjoner
+  - DEICH-496: person/orgianisasjonslinker peker til søk (personsiden midl. avviklet)
+  - DEICH-225: Fritekstsøk søker også i format og medietype
+  - DEICH-303: Navn på innlogget låner synlig
+- catalinker:
+  - DEICH-470: Import fra BS håndterer nå alle UTF-8 tegn
+  - DEICH-472: Fiks feil søkeuttrykk i verkstittel
+  - DEICH-485: Fiks feil der flere verdier vises som én
+  - DEICH-441: Nytt felt for verk: opprinnelsesland
+  - DEICH-481: Registrere verksserie
+- services:
+  - DEICH-481/DEICH-225: Beskrevet over
+
 ## 0.6.2 (2016-11-24) bugfixes/extras/reverts
 
 KOHA:   2ad15d86c314e0ef882fb9cf1eb9515f98dacf2a

docker-compose/docker-compose-template-dev.yml

@@ -387,7 +387,7 @@ services:
 
   z3950proxy:
     container_name: z3950proxy
-    image: "digibib/z3950proxy"
+    image: "digibib/z3950proxy:331137ac40ba155760c311e5197fa9fa73cf4c27"
     networks:
       - backend
     ports:

docker-compose/docker-compose-template-prod.yml

@@ -268,7 +268,7 @@ services:
 
   z3950proxy:
     container_name: z3950proxy
-    image: "digibib/z3950proxy"
+    image: "digibib/z3950proxy:331137ac40ba155760c311e5197fa9fa73cf4c27"
     networks:
       - backend
     environment:

docker-compose/docker-compose.env

@@ -2,7 +2,7 @@ export SIP_PORT=6001
 export SIP_PROXY_PORT=6002
 export SIP_AUTOPASS=secret
 export SIP_AUTOPASS_ENCRYPTED=encryptme
-export KOHA_IMAGE_TAG=2ad15d86c314e0ef882fb9cf1eb9515f98dacf2a
+export KOHA_IMAGE_TAG=008a33634de04bda2287dd7fc8d89a53c7bc968d
 export KOHA_ADMINUSER=admin
 export KOHA_ADMINPASS=secret
 export KOHA_INSTANCE=name

redef/catalinker/client/scss/style.scss

@@ -413,8 +413,7 @@ body {
             }
             input[type="checkbox"] + .save-placeholder {
               top: 11px;
-              float: right;
-              right: -90px;
+              padding-left: 52%;
             }
             input:not([type=checkbox]) + .save-placeholder {
               top: 17px;
@@ -440,7 +439,7 @@ body {
 
             input[type=checkbox] {
               width: auto;
-              margin-top: -4px;
+              margin-top: -7px;
             }
             .explanation {
               margin-left: 0.5em;
@@ -1010,12 +1009,12 @@ body {
       display: block;
       margin-bottom: 5px;
     }
-    .value-list, .value {
+    .value-list, .multi-value {
       margin-bottom: 5px;
-      .list-value:not(:last-child):after {
+      .list-value:not(:last-child):not(.separate-lines):after {
         content: " - ";
       }
-      .predefined-value:not(:last-child):after {
+      .value:not(:last-child):not(.separate-lines):after {
         content: ", ";
       }
       .subject-type-association:before {

redef/catalinker/client/src/main.js

@@ -1184,6 +1184,8 @@
         case 'deichman:CompositionType':
         case 'deichman:ClassificationSource':
         case 'deichman:ClassificationEntry':
+        case 'deichman:WorkSeries' :
+        case 'deichman:WorkSeriesPart':
         case 'http://www.w3.org/2001/XMLSchema#anyURI':
           rdfType = 'http://www.w3.org/2001/XMLSchema#anyURI'
           inputType = 'input-string'
@@ -1346,7 +1348,7 @@
                 _.each(resourceForm.inputs, function (formInput) {
                   var predicate = ontologyUri + formInput.rdfProperty
                   var ontologyInput = inputMap[ resourceForm.rdfType + '.' + predicate ]
-                  _.extend(formInput, _.omit(ontologyInput, formInput.type ? 'type' : ''))
+                  _.extend(formInput, _.omit(ontologyInput, formInput.type ? 'type' : '', formInput.label ? 'label' : ''))
                   formInput[ 'values' ] = emptyValues(false)
                   formInput[ 'rdfType' ] = resourceForm.rdfType
                   if (targetResourceIsMainEntry) {
@@ -1463,6 +1465,9 @@
             if (input.oneLiner) {
               ontologyInput.oneLiner = input.oneLiner
             }
+            if (input.label) {
+              ontologyInput.label = input.label
+            }
             if (input.showOnlyWhenInputHasValue) {
               ontologyInput.showOnlyWhenInputHasValue = input.showOnlyWhenInputHasValue
             }
@@ -1859,16 +1864,15 @@
       }
     }
 
+    let closePreview = function () {
+      $('#iframecontainer').hide()
+      $('#block').fadeOut()
+    }
+
     function showOverlay (uri) {
-      let closePreview = function () {
-        $('#iframecontainer').hide()
-        $('#block').fadeOut()
-      }
-      $('#block').click(closePreview)
-      $('#block').fadeIn()
+      $('#block').click(closePreview).fadeIn()
       $('#close-preview-button').click(closePreview)
-      $('#iframecontainer').fadeIn()
-      $('#iframecontainer iframe').attr('src', uri).load(function () {
+      $('#iframecontainer').fadeIn().find('iframe').attr('src', uri).load(function () {
         $('#loader').fadeOut(function () {
           $('iframe').fadeIn()
         })
@@ -2915,6 +2919,7 @@
                   }
                   return resourceUri
                 }
+
                 function setCreatedResourceValuesInMainInputs () {
                   let groupInputs = ractive.get('inputGroups')
                   _.each(event.context.inputs, function (input) {
@@ -2927,6 +2932,7 @@
                     })
                   })
                 }
+
                 let setTargetUri = function (resourceUri) {
                   if (useAfterCreation) {
                     ractive.set('targetUri.' + event.context.rdfType, resourceUri)
@@ -3730,6 +3736,11 @@
           .then(setDisplayMode)
           .then(function (applicationData) {
             setTaskDescription(options.task)
+            $(document).keyup(function (e) {
+              if (e.keyCode === 27) {
+                closePreview()
+              }
+            })
             return applicationData
           })
           .then(hideGrowler)

redef/catalinker/client/src/main_old.js

@@ -279,6 +279,7 @@
           case 'deichman:CompositionType':
           case 'deichman:Instrument':
           case 'deichman:ClassificationSource':
+          case 'deichman:WorkSeries' :
             // TODO infer from ontology that this is an URI
             // (because deichman:Work a rdfs:Class)
             input.datatype = "http://www.w3.org/2001/XMLSchema#anyURI";
@@ -290,6 +291,7 @@
           case 'deichman:WorkRelation':
           case 'deichman:Instrumentation':
           case 'deichman:ClassificationEntry':
+          case 'deichman:WorkSeriesPart':
             break;
           default:
             throw "Doesn't know which input-type to assign to range: " + input.range;

redef/catalinker/public/partials/readonly-input.html

@@ -4,14 +4,14 @@
         {{#if ! reportFormat.topLevel}}
             <span class="pure-u-1-2 label" data-uri-escaped-label="{{encodeURI(label)}}">{{label}}</span>
         {{/if}}
-        <span class-pure-u-1-1="{{reportFormat.topLevel}}" class-pure-u-1-2="{{!reportFormat.topLevel}}">
+        <span class-pure-u-1-1="{{reportFormat.topLevel}}" class-pure-u-1-2="{{!reportFormat.topLevel}}" class="multi-value">
                 {{#each values:inputValueIndex}}
                     <span class="value" class-separate-lines="{{reportFormat.separateLines}}">
                         {{>"readonly-" + type}}
                     </span>
                 {{/each}}
                 {{#if subInputs}}
-                    <span class="pure-g">
+                    <span class-pure-g="{{!reportFormat.list}}">
                         {{#each subInputs[0].input.values:inputValueIndex}}
                         <span class-compound="{{reportFormat.topLevel}}">
                         {{#if ./nonEditable}}

redef/catalinker/public/partials/readonly-select-predefined-value.html

@@ -1,3 +1,3 @@
 {{#each ./current.value}}
-<span class="predefined-value">{{predefinedLabelValue(fragment || input.fragment, .)}}</span>
+<span class="value">{{predefinedLabelValue(fragment || input.fragment, .)}}</span>
 {{/each}}

redef/catalinker/server/server.js

@@ -90,7 +90,7 @@ app.get('/cataloguing', function (req, res, next) {
   res.sendFile('main.html', { title: 'Katalogisering', root: path.join(__dirname, '/../public/') })
 })
 
-app.get('/:type(person|work|publication|place|serial|corporation|subject|genre)', function (req, res, next) {
+app.get('/:type(person|work|publication|place|serial|corporation|subject|genre|workSeries)', function (req, res, next) {
   newResource(req.params.type).then(function (response) {
     res.redirect('/cataloguing_old/' + req.params.type + '?resource=' + response.headers.location)
   })