Update from core dev

opf · Dec 10, 2018 · 0770ef2 · 0770ef2
2 parents de3de1a + 2536285
commit 0770ef2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -89,6 +89,7 @@ jobs:
       script:
       - bash script/ci/setup.sh spec_legacy mysql
       - bash script/ci/runner.sh spec_legacy 1 1
+      if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
       name: 'spec_legacy (1/1) - postgres'
       script:
@@ -99,6 +100,7 @@ jobs:
       script:
       - bash script/ci/setup.sh units mysql
       - bash script/ci/runner.sh units 4 1
+      if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
       name: 'units (1/4) - postgres'
       script:
@@ -109,6 +111,7 @@ jobs:
       script:
       - bash script/ci/setup.sh units mysql
       - bash script/ci/runner.sh units 4 2
+      if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
       name: 'units (2/4) - postgres'
       script:
@@ -119,6 +122,7 @@ jobs:
       script:
       - bash script/ci/setup.sh units mysql
       - bash script/ci/runner.sh units 4 3
+      if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
       name: 'units (3/4) - postgres'
       script:
@@ -129,6 +133,7 @@ jobs:
       script:
       - bash script/ci/setup.sh units mysql
       - bash script/ci/runner.sh units 4 4
+      if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
       name: 'units (4/4) - postgres'
       script:
@@ -139,6 +144,7 @@ jobs:
       script:
       - bash script/ci/setup.sh features mysql
       - bash script/ci/runner.sh features 4 1
+      if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
       name: 'features (1/4) - postgres'
       script:
@@ -149,6 +155,7 @@ jobs:
       script:
       - bash script/ci/setup.sh features mysql
       - bash script/ci/runner.sh features 4 2
+      if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
       name: 'features (2/4) - postgres'
       script:
@@ -159,6 +166,7 @@ jobs:
       script:
       - bash script/ci/setup.sh features mysql
       - bash script/ci/runner.sh features 4 3
+      if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
       name: 'features (3/4) - postgres'
       script:
@@ -169,6 +177,7 @@ jobs:
       script:
       - bash script/ci/setup.sh features mysql
       - bash script/ci/runner.sh features 4 4
+      if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
       name: 'features (4/4) - postgres'
       script:
@@ -179,7 +188,7 @@ jobs:
       script:
       - bash script/ci/setup.sh plugins:units mysql
       - bash script/ci/runner.sh plugins:units 1 1
-      if: head_branch !~ /^core\//
+      if: env(SKIP_MYSQL_TESTING) IS blank AND head_branch !~ /^core\//
     - stage: test
       name: 'plugins:units (1/1) - postgres'
       script:
@@ -191,7 +200,7 @@ jobs:
       script:
       - bash script/ci/setup.sh plugins:features mysql
       - bash script/ci/runner.sh plugins:features 1 1
-      if: head_branch !~ /^core\//
+      if: env(SKIP_MYSQL_TESTING) IS blank AND head_branch !~ /^core\//
     - stage: test
       name: 'plugins:features (1/1) - postgres'
       script:
@@ -203,7 +212,7 @@ jobs:
       script:
       - bash script/ci/setup.sh plugins:cucumber mysql
       - bash script/ci/runner.sh plugins:cucumber 1 1
-      if: head_branch !~ /^core\//
+      if: env(SKIP_MYSQL_TESTING) IS blank AND head_branch !~ /^core\//
     - stage: test
       name: 'plugins:cucumber (1/1) - postgres'
       script:

diff --git a/frontend/src/app/components/work-packages/wp-breadcrumb/wp-breadcrumb-parent.html b/frontend/src/app/components/work-packages/wp-breadcrumb/wp-breadcrumb-parent.html
@@ -10,7 +10,7 @@
     (execute)="open()"
     *ngIf="canModifyParent()"
     [linkTitle]="parent ? text.edit_parent : text.set_parent"
-    linkClass="wp-relation--parent-change">
+    linkClass="wp-relation--parent-change hide-when-print">
     <op-icon icon-classes="icon-small {{ parent ? 'icon-edit icon2' : 'icon-add icon4' }}"></op-icon>
     <span *ngIf="!parent" [textContent]="text.set_parent"></span>
   </accessible-by-keyboard>

diff --git a/frontend/src/app/components/wp-edit/wp-edit-field/wp-edit-field.component.ts b/frontend/src/app/components/wp-edit/wp-edit-field/wp-edit-field.component.ts
@@ -93,7 +93,7 @@ export class WorkPackageEditFieldComponent implements OnInit {
 
   // Open the field when its closed and relay drag & drop events to it.
   public startDragOverActivation(event:JQueryEventObject) {
-    if (!this.isDropTarget || this.active) {
+    if (!this.isDropTarget || !this.isEditable || this.active) {
       return true;
     }
 

diff --git a/script/ci/cache_prepare.sh b/script/ci/cache_prepare.sh
@@ -38,9 +38,8 @@ run() {
   eval $2;
 }
 
-run "mysql -u root -e \"CREATE DATABASE IF NOT EXISTS travis_ci_test DEFAULT CHARACTER SET = 'utf8' DEFAULT COLLATE 'utf8_general_ci';\""
-run "mysql -u root -e \"GRANT ALL ON travis_ci_test.* TO 'travis'@'localhost';\""
-run "cp script/templates/database.travis.mysql.yml config/database.yml"
+run "psql -c 'create database travis_ci_test;' -U postgres"
+run "cp script/templates/database.travis.postgres.yml config/database.yml"
 
 run "bundle exec rake db:migrate"