X-Git-Url: https://git.cweiske.de/grauphel.git/blobdiff_plain/62340c61f3ab49aa405c549b43e2cd910ab4d834..fdc7b416ddd51376c388d3e99aef8c12b6a17895:/controller/apicontroller.php?ds=sidebyside

diff --git a/controller/apicontroller.php b/controller/apicontroller.php
index 39de60d..23a47e7 100644
--- a/controller/apicontroller.php
+++ b/controller/apicontroller.php
@@ -119,7 +119,7 @@ class ApiController extends Controller
                         'grauphel.api.user', array('username' => $username)
                     )
                 ),
-                'href' => null,//FIXME
+                'href' => null,
             );
         }
 
@@ -167,7 +167,9 @@ class ApiController extends Controller
                         'grauphel.api.notes', array('username' => $username)
                     )
                 ),
-                'href'    => null,
+                'href'    => $this->deps->urlGen->getAbsoluteURL(
+                    $this->deps->urlGen->linkToRoute('grauphel.gui.index')
+                ),
             ),
             'latest-sync-revision' => $syncdata->latestSyncRevision,
             'current-sync-guid'    => $syncdata->currentSyncGuid,
@@ -285,7 +287,8 @@ class ApiController extends Controller
         }
 
         //update
-        \OC_DB::beginTransaction();
+        $db = \OC::$server->getDatabaseConnection();
+        $db->beginTransaction();
         try {
             ++$syncdata->latestSyncRevision;
             foreach ($arPut['note-changes'] as $noteUpdate) {
@@ -304,9 +307,9 @@ class ApiController extends Controller
             }
 
             $this->notes->saveSyncData($syncdata);
-            \OC_DB::commit();
+            $db->commit();
         } catch (\DatabaseException $e) {
-            \OC_DB::getConnection()->rollBack();
+            $db->rollBack();
             throw $e;
         }
     }