Merge branch '2015.11' into 2015.11-develop

tine20 · Apr 28, 2016 · 6e7c210 · 6e7c210
2 parents f7645f6 + 9d966a7
commit 6e7c210
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/tests/tine20/Tinebase/User/LdapTest.php b/tests/tine20/Tinebase/User/LdapTest.php
@@ -274,7 +274,8 @@ public function testSyncDeleted()
         sleep(1);
         Tinebase_User::syncUsers($syncOptions);
         $user = Tinebase_User::getInstance()->getUserByPropertyFromSqlBackend('accountId', $user->getId(), 'Tinebase_Model_FullUser');
-        $this->assertEquals($now->toString(), $user->accountExpires->toString(), 'expiry date should still be the same');
+        $this->assertTrue($now->toString() == $user->accountExpires->toString() ||
+            $now->subSecond(1)->toString() == $user->accountExpires->toString(), 'expiry date should still be the same');
 
         // set expired to -1 year -> user should be deleted
         $user->accountExpires = $now->subYear(1);

diff --git a/tine20/Tinebase/js/widgets/grid/LinkGridPanel.js b/tine20/Tinebase/js/widgets/grid/LinkGridPanel.js
@@ -172,6 +172,11 @@ Tine.widgets.grid.LinkGridPanel = Ext.extend(Tine.widgets.grid.PickerGridPanel,
 
         // check if already in
         if (this.store.findExact('related_id', recordToAdd.id) === -1) {
+            var recordType = record.get('type');
+            if (! Ext.isString(recordType) && recordType['default']) {
+                record.set('type', recordType['default']);
+                record.commit();
+            }
             this.store.add([record]);
         }
 

diff --git a/tine20/build.xml b/tine20/build.xml
@@ -140,12 +140,13 @@
         <property name="testinclude" value="AllTests.php" override="true" />
         <property name="includepath" value=".:/usr/share/php/:${configdir}:${project.basedir}:${project.basedir}/library:${project.basedir}/library/zf1ext" override="true" />
         <property name="testadditionalparams" value="" override="true" />
+        <property name="testsuite" value="tine20" override="true" />
 
         <echo msg="Starting Tests..." />
         <echo msg="Using config file ${testconfigdir}/phpunit.xml" />
         <echo msg="Setting include_path to ${includepath}" />
 
-        <exec executable="${project.basedir}/vendor/bin/phpunit" dir="${project.basedir}/../tests/tine20" passthru="true">
+        <exec executable="${project.basedir}/vendor/bin/phpunit" dir="${project.basedir}/../tests/${testsuite}" passthru="true">
              <arg line="-d max_execution_time=0
              -d include_path=${includepath}
              --configuration ${testconfigdir}/phpunit.xml
@@ -183,7 +184,7 @@
 
     <!-- ============================================  -->
     <!-- Target: report                                -->
-    <!-- TODO remove code duplication (phpunit target) -->
+    <!-- TODO remove code duplication (phpunit target) OR remove this -->
     <!-- ============================================  -->
     <target name="report">
         <echo msg="Starting Tests..." />