Share info panel : fix copy bytton style.

Share: avoid using null repoId. Server catchError: do not use error code as request status !
pydio · Sep 22, 2016 · 228f7d8 · 228f7d8
1 parent 9a6a777
commit 228f7d8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/core/src/core/src/pydio/Core/Http/Server.php b/core/src/core/src/pydio/Core/Http/Server.php
@@ -239,9 +239,10 @@ public function catchError($code, $message, $fichier, $ligne, $context)
         $req = $this->getRequest();
         $resp = new Response();
         $x = new SerializableResponseStream();
-        $resp = $resp
+        if($code > 100 && $code < 599){
-            ->withStatus($code)
+            $resp = $resp->withStatus($code);
-            ->withBody($x);
+        }
+        $resp = $resp->withBody($x);
         $x->addChunk(new UserMessage($message, LOG_LEVEL_ERROR));
         $this->topMiddleware->emitResponse($req, $resp);
 

diff --git a/core/src/plugins/action.share/res/react-share-form.css b/core/src/plugins/action.share/res/react-share-form.css
@@ -422,7 +422,8 @@ div#ajxp_shared_info_panel .copy-button {
   cursor: pointer;
   background-color: rgba(255, 255, 255, 0.87);
   padding: 7px;
-  font-size: 14px;
+  font-size: 13px;
+  height: 12px;
   border-radius: 0 2px 2px 0;
 }
 div#ajxp_shared_info_panel .copy-message {

diff --git a/core/src/plugins/action.share/res/react-share-form.less b/core/src/plugins/action.share/res/react-share-form.less
@@ -446,7 +446,8 @@ div#ajxp_shared_info_panel{
     cursor: pointer;
     background-color: rgba(255, 255, 255, 0.87);
     padding: 7px;
-    font-size: 14px;
+    font-size: 13px;
+    height: 12px;
     border-radius: 0 2px 2px 0;
   }
   .copy-message{

diff --git a/core/src/plugins/action.share/src/Store/ShareStore.php b/core/src/plugins/action.share/src/Store/ShareStore.php
@@ -440,7 +440,7 @@ public function deleteShare($type, $element, $keepRepository = false, $ignoreRep
                 $owner = $repo->getOwner();
                 $this->testUserCanEditShare($repo->getOwner(), $repo->options);
             }
-            if(!$keepRepository){
+            if($repoId !== null && !$keepRepository){
                 $res = RepositoryService::deleteRepository($repoId);
                 if ($res == -1) {
                     throw new \Exception($mess[427]);