Fix setting/unsetting watch on shared folder.

Fix notification grouping in alert feed.
pydio · Oct 24, 2015 · fc11e63 · fc11e63
1 parent 1d589df
commit fc11e63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -1572,7 +1572,7 @@ public function createSharedMinisite($httpVars, $repository, $accessDriver)
         if(isset($existingData)){
             $repo = ConfService::getRepositoryById($existingData["REPOSITORY"]);
             if($repo == null) throw new Exception("Oups, something went wrong");
-            $this->shareStore->testUserCanEditShare($repo->getOwner());
+            $this->getShareStore()->testUserCanEditShare($repo->getOwner());
             $data = $existingData;
         }else{
             $data = array(
@@ -1828,7 +1828,7 @@ public function createSharedRepository($httpVars, $repository, $accessDriver, $u
             $options["PLUGINS_DATA"] = $customData;
         }
         if (isSet($editingRepo)) {
-            $this->shareStore->testUserCanEditShare($editingRepo->getOwner());
+            $this->getShareStore()->testUserCanEditShare($editingRepo->getOwner());
             $newRepo = $editingRepo;
             $replace = false;
             if ($editingRepo->getDisplay() != $label) {
@@ -2462,7 +2462,7 @@ public function shareToJson($shareId, $shareData, $node = null){
                 "expire_time"      => ($pData["EXPIRE_TIME"]!=0?date($messages["date_format"], $pData["EXPIRE_TIME"]):0),
                 "has_password"     => (!empty($pData["PASSWORD"])),
                 "element_watch"    => $elementWatch,
-                "is_expired"       => $this->shareStore->isShareExpired($shareId, $pData)
+                "is_expired"       => $this->getShareStore()->isShareExpired($shareId, $pData)
             ), $shareData);
 
 
@@ -2518,7 +2518,7 @@ public function shareToJson($shareId, $shareData, $node = null){
                 );
             }
             if($node != null){
-                $sharedEntries = $this->computeSharedRepositoryAccessRights($repoId, true, $node->getUrl());
+                $sharedEntries = $this->computeSharedRepositoryAccessRights($repoId, true, "pydio://".$repoId."/");
             }else{
                 $sharedEntries = $this->computeSharedRepositoryAccessRights($repoId, true, null);
             }
@@ -2550,7 +2550,7 @@ public function shareToJson($shareId, $shareData, $node = null){
                 }else{
                     $jsonData["expire_after"] = 0;
                 }
-                $jsonData["is_expired"] = $this->shareStore->isShareExpired($shareId, $minisiteData);
+                $jsonData["is_expired"] = $this->getShareStore()->isShareExpired($shareId, $minisiteData);
                 if(isSet($minisiteData["AJXP_TEMPLATE_NAME"])){
                     $jsonData["minisite_layout"] = $minisiteData["AJXP_TEMPLATE_NAME"];
                 }

diff --git a/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php b/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php
@@ -332,6 +332,7 @@ public function loadUserAlerts($actionName, $httpVars, $fileVars)
                     $parentNodeURL = $node->getScheme()."://".$repositoryFilter.$relative;
                     $this->logDebug("action.share", "Recompute alert to ".$parentNodeURL);
                     $node = new AJXP_Node($parentNodeURL);
+                    $path = $node->getPath();
                 }