Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bVIFR-00081n-L1 for pgadmin-hackers@arkaria.postgresql.org; Thu, 04 Aug 2016 12:59:41 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bVIFQ-00022k-Lm for pgadmin-hackers@arkaria.postgresql.org; Thu, 04 Aug 2016 12:59:40 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bVIFQ-00022e-9O for pgadmin-hackers@postgresql.org; Thu, 04 Aug 2016 12:59:40 +0000 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bVIFM-0002Rp-IX for pgadmin-hackers@postgresql.org; Thu, 04 Aug 2016 12:59:38 +0000 Received: by mail-wm0-x22d.google.com with SMTP id i5so377282092wmg.0 for ; Thu, 04 Aug 2016 05:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=8nJxEsU//RHMdJdteEvmUYF/dRv/m4uA0KrX8943WXk=; b=gt/ImRLZvcn76A6ISs8m22WXsS6362dv/xDcJZ2O8FfJbbVbSgNI2Dk+gU4F1KWuk1 UjcjQ+1tVUyDwMf1pISjReGZZql5Uh/Ouq8ijuXH/pF098P+lRydi0q0NMxNJXG+6IF8 08RZI655khHqeNW9DOLmD40zKGlHy4aW1jZQ44Z6kH2G0hM1KZmS6Zj1cQryTvFTKbos 9+fRInBDLE9PKwE01n26UaL8bs9bAeuo/Ax5LAGULy0k3f6mAa32VnAHUrAtezfkvRwS NJUqn1kUAERbwiIGm1Bb+7zXbEQZDdZWU4vleFpo0kyU6Y+8UlaX879ll+TZiUNaXqJH RIrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=8nJxEsU//RHMdJdteEvmUYF/dRv/m4uA0KrX8943WXk=; b=kMEf3MWdU1tPGc+J9iYm/4uCQaAOr13/6c7TRI/wA5EQROKBKk4xbGqeaYl9/w0j5t 5Qd8c+v+N2iEcc9Mfeb4EJ0mfG2xmnx5ejY1MhqFeaC3+UOVS55Kbx8uRVjYtzJo2I0m ER4HFVjO7yooovlvDLj9+M/DqTLknxMvviPyfHXJ4fYwgHlPnvI4OLWy4i0zvu+hpc55 Is+v2K8sJdFcFgncAHpkk/mniStd3jM+dKpSyeqyMn/jzyv+bCYeRRsWFHlXGlRn+4g6 PY8CN9V++DPrmFWKOvOqjKCUIaWqwcnvFqgUhQ1pcmgLXTsbfxQdJ0fnfvdV5vc0GAt0 9rBQ== X-Gm-Message-State: AEkoous1YQkAdwmtFAp9fGknxLhc2kuMznIZLzO6EYgKeHRu2Gwkg61XMJROk/TOZMsxCk7mlxJtvlabK9Brs5zS X-Received: by 10.194.187.134 with SMTP id fs6mr37630783wjc.3.1470315573841; Thu, 04 Aug 2016 05:59:33 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.167.81 with HTTP; Thu, 4 Aug 2016 05:59:03 -0700 (PDT) From: Surinder Kumar Date: Thu, 4 Aug 2016 18:29:03 +0530 Message-ID: Subject: [pgAdmin4][Patch]: RM1397 - File upload not working in File Manager in pgAdmin4 Runtime To: pgadmin-hackers Content-Type: multipart/mixed; boundary=047d7bb049a67d2ecc05393e8520 X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --047d7bb049a67d2ecc05393e8520 Content-Type: multipart/alternative; boundary=047d7bb049a67d2ec805393e851e --047d7bb049a67d2ec805393e851e Content-Type: text/plain; charset=UTF-8 Hi *Issue:* When a file is uploaded via FileManager it gets storage directory path from STORAGE_DIR config variable. but in case of pgAdmin4 Runtime it is set to None, that means STORAGE_DIR path should be the root directory. The path formed to file was "None/filename.ext'. but it should be '/filename.txt' which is now fixed. Please find attached patch and review. Thanks, Surinder Kumar --047d7bb049a67d2ec805393e851e Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi<= /div>

Issue:
When a file is uploaded vi= a FileManager it gets storage directory path from STORAGE_DIR config variab= le. but in case of pgAdmin4 Runtime it is set to None, that means STORAGE_D= IR path should be the root directory.

The path formed to file was "None/filename.ext'. but = it should be '/filename.txt' which is now fixed.
Please find attached patch and re= view.

Thanks,
Surinder Kumar
--047d7bb049a67d2ec805393e851e-- --047d7bb049a67d2ecc05393e8520 Content-Type: application/octet-stream; name="RM1397.patch" Content-Disposition: attachment; filename="RM1397.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_irgbwhhz0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL19f aW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvX19p bml0X18ucHkKaW5kZXggZDc4OGI5ZS4uMGZlNmYwNCAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvX19pbml0X18ucHkKKysr IGIvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvX19pbml0X18ucHkK QEAgLTI0MiwxMyArMjQyLDE1IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVj dCk6CiAgICAgICAgIHNlbGYudHJhbnNfaWQgPSB0cmFuc19pZAogICAgICAg ICBzZWxmLnBhdGhlcnJvciA9IGVuY29kZV9qc29uKAogICAgICAgICAgICAg ewotICAgICAgICAgICAgICAgICdFcnJvcic6IGdldHRleHQoJ05vIHBlcm1p c3Npb24gdG8gb3BlcmF0ZSBvbiBzcGVjaWZpZWQgcGF0aC4nKSwKKyAgICAg ICAgICAgICAgICAnRXJyb3InOiBnZXR0ZXh0KCdObyBwZXJtaXNzaW9uIHRv IG9wZXJhdGUgb24gXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHNwZWNpZmllZCBwYXRoLicpLAogICAgICAgICAgICAgICAgICdDb2Rl JzogLTEKICAgICAgICAgICAgIH0KICAgICAgICAgKQogICAgICAgICBzZWxm LmRpciA9IGdldF9zdG9yYWdlX2RpcmVjdG9yeSgpCgotICAgICAgICBpZiBz ZWxmLmRpciBpcyBub3QgTm9uZSBhbmQgaXNpbnN0YW5jZShzZWxmLmRpciwg bGlzdCk6CisgICAgICAgIGlmICgoc2VsZi5kaXIgaXMgbm90IE5vbmUgYW5k IGlzaW5zdGFuY2Uoc2VsZi5kaXIsIGxpc3QpKSBvcgorICAgICAgICAgICBz ZWxmLmRpciBpcyBOb25lKToKICAgICAgICAgICAgIHNlbGYuZGlyID0gIiIK CiAgICAgQHN0YXRpY21ldGhvZAo= --047d7bb049a67d2ecc05393e8520 Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --047d7bb049a67d2ecc05393e8520--