correct bug #26583 click on types for notice
authorymh <ymh.work@gmail.com>
Mon, 03 Apr 2017 15:29:30 +0200
changeset 529 5d9eacbd5794
parent 528 aa4fc985bf64
child 530 a76bae4795d5
correct bug #26583 click on types for notice
cms/app-client/app/components/notice-component.js
cms/app-client/app/templates/components/notice-component.hbs
dev/Vagrantfile
server/src/phpunit.xml
server/src/tests/Models/TranscriptResourceTest.php
--- a/cms/app-client/app/components/notice-component.js	Mon Apr 03 15:23:50 2017 +0200
+++ b/cms/app-client/app/components/notice-component.js	Mon Apr 03 15:29:30 2017 +0200
@@ -57,7 +57,7 @@
         },
 
         addTypeFilter: function(id) {
-            this.get('filter').setFilter('theme', id);
+            this.get('filter').setFilter('discourse', id);
         },
 
         addCreatedFilter: function(dateStr) {
--- a/cms/app-client/app/templates/components/notice-component.hbs	Mon Apr 03 15:23:50 2017 +0200
+++ b/cms/app-client/app/templates/components/notice-component.hbs	Mon Apr 03 15:29:30 2017 +0200
@@ -39,7 +39,7 @@
       <ul>
         {{#each item.types as |type|}}
         <li>
-          {{component (get-link-type type) url=type onClick=(action "addThemeFilter" type) displayUrlLink=true}}
+          {{component (get-link-type type) url=type onClick=(action "addTypeFilter" type) displayUrlLink=true}}
         </li>
         {{/each}}
       </ul>
--- a/dev/Vagrantfile	Mon Apr 03 15:23:50 2017 +0200
+++ b/dev/Vagrantfile	Mon Apr 03 15:29:30 2017 +0200
@@ -29,6 +29,8 @@
   # using a specific IP.
   # config.vm.network "private_network", ip: "192.168.33.10"
   config.vm.network :private_network, ip: (ENV['VM_IP'] || context['vm_ip'] || "172.16.1.6")
+#  config.vm.network :private_network, ip: (ENV['VM_IP'] || context['vm_ip'] || "172.16.1.6"), virtualbox__intnet: true, adapter: "1"
+#  config.vm.network :private_network, ip: (ENV['VM_IP'] || context['vm_ip'] || "172.16.1.6"), virtualbox__intnet: true
 
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
@@ -36,6 +38,7 @@
   # config.vm.network "forwarded_port", guest: 80, host: 8080
   default_ports = {
     80   => 40000,
+    22   => 22220,
     443  => 44300,
     3306 => 33060,
     5432 => 54320,
--- a/server/src/phpunit.xml	Mon Apr 03 15:23:50 2017 +0200
+++ b/server/src/phpunit.xml	Mon Apr 03 15:29:30 2017 +0200
@@ -33,5 +33,10 @@
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="CORPUSPAROLE_RDF4J_REPOSITORY" value="cocoon_test"/>
+        <env name="HANDLE_HOST" value="172.16.1.6"/>
+        <env name="HANDLE_PORT" value="8000"/>
+        <env name="HANDLE_PREFIX" value="11280.100"/>
+        <env name="HANDLE_ADMIN_ID" value="300:11280.100/CORPUS_ADMIN"/>
+
     </php>
 </phpunit>
--- a/server/src/tests/Models/TranscriptResourceTest.php	Mon Apr 03 15:23:50 2017 +0200
+++ b/server/src/tests/Models/TranscriptResourceTest.php	Mon Apr 03 15:29:30 2017 +0200
@@ -75,8 +75,9 @@
         $this->assertEquals(
             [
                 'url' => "http://cocoon.huma-num.fr/exist/crdo/cfpp2000/fra/Ozgur_Kilic_H_32_alii_3e-2.xml",
-                "format" => "application/xml",
-                "conforms-to" => "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber"
+                'format' => "application/xml",
+                'conforms-to' => "http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-dtd_transcriber",
+                'rights' => "http://creativecommons.org/licenses/by-nc-sa/3.0/"
             ],
             $json
         );