From 7eb78c80ef2fec4b8982173a2833b220c0019d5f Mon Sep 17 00:00:00 2001 From: doloresjuliana Date: Sat, 29 Dec 2018 20:15:44 +0100 Subject: [PATCH] version 0.1.0 - includes tagging in Nextcloud --- .../doctype/nextcloud_settings/nextcloud_settings.json | 4 ++-- pibiapp/nextcloud/doctype/nextcloud_tags/__init__.py | 0 pibiapp/nextcloud/doctype/nextcloud_tags/nextcloud_tags.js | 0 .../nextcloud/doctype/nextcloud_tags/nextcloud_tags.json | 0 pibiapp/nextcloud/doctype/nextcloud_tags/nextcloud_tags.py | 0 .../doctype/nextcloud_tags/test_nextcloud_tags.js | 0 .../doctype/nextcloud_tags/test_nextcloud_tags.py | 0 pibiapp/nextcloud/nextcloud_link.py | 7 ++++--- pibiapp/nextcloud/tagpropfind.xml | 0 9 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 pibiapp/nextcloud/doctype/nextcloud_tags/__init__.py mode change 100644 => 100755 pibiapp/nextcloud/doctype/nextcloud_tags/nextcloud_tags.js mode change 100644 => 100755 pibiapp/nextcloud/doctype/nextcloud_tags/nextcloud_tags.json mode change 100644 => 100755 pibiapp/nextcloud/doctype/nextcloud_tags/nextcloud_tags.py mode change 100644 => 100755 pibiapp/nextcloud/doctype/nextcloud_tags/test_nextcloud_tags.js mode change 100644 => 100755 pibiapp/nextcloud/doctype/nextcloud_tags/test_nextcloud_tags.py mode change 100644 => 100755 pibiapp/nextcloud/tagpropfind.xml diff --git a/pibiapp/nextcloud/doctype/nextcloud_settings/nextcloud_settings.json b/pibiapp/nextcloud/doctype/nextcloud_settings/nextcloud_settings.json index 6fb755d..072f82b 100755 --- a/pibiapp/nextcloud/doctype/nextcloud_settings/nextcloud_settings.json +++ b/pibiapp/nextcloud/doctype/nextcloud_settings/nextcloud_settings.json @@ -521,7 +521,7 @@ "default": "0", "fieldname": "last_id_tag", "fieldtype": "Int", - "hidden": 0, + "hidden": 1, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, @@ -555,7 +555,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2018-12-27 13:04:20.202860", + "modified": "2018-12-29 20:10:24.121216", "modified_by": "Administrator", "module": "Nextcloud", "name": "Nextcloud Settings", diff --git a/pibiapp/nextcloud/doctype/nextcloud_tags/__init__.py b/pibiapp/nextcloud/doctype/nextcloud_tags/__init__.py old mode 100644 new mode 100755 diff --git a/pibiapp/nextcloud/doctype/nextcloud_tags/nextcloud_tags.js b/pibiapp/nextcloud/doctype/nextcloud_tags/nextcloud_tags.js old mode 100644 new mode 100755 diff --git a/pibiapp/nextcloud/doctype/nextcloud_tags/nextcloud_tags.json b/pibiapp/nextcloud/doctype/nextcloud_tags/nextcloud_tags.json old mode 100644 new mode 100755 diff --git a/pibiapp/nextcloud/doctype/nextcloud_tags/nextcloud_tags.py b/pibiapp/nextcloud/doctype/nextcloud_tags/nextcloud_tags.py old mode 100644 new mode 100755 diff --git a/pibiapp/nextcloud/doctype/nextcloud_tags/test_nextcloud_tags.js b/pibiapp/nextcloud/doctype/nextcloud_tags/test_nextcloud_tags.js old mode 100644 new mode 100755 diff --git a/pibiapp/nextcloud/doctype/nextcloud_tags/test_nextcloud_tags.py b/pibiapp/nextcloud/doctype/nextcloud_tags/test_nextcloud_tags.py old mode 100644 new mode 100755 diff --git a/pibiapp/nextcloud/nextcloud_link.py b/pibiapp/nextcloud/nextcloud_link.py index a1c99f4..05e4b80 100755 --- a/pibiapp/nextcloud/nextcloud_link.py +++ b/pibiapp/nextcloud/nextcloud_link.py @@ -121,7 +121,8 @@ def nextcloud_insert(doc, method=None): # Excluded module if module in nc.excludedmodules: return site = frappe.local.site - local_fileobj = "./" + site + doc.file_url + if doc.is_private: local_fileobj = "./" + site + doc.file_url + else: local_fileobj = "./" + site + "/public" + doc.file_url fileobj = local_fileobj.split('/') uu = len(fileobj) - 1 # get path @@ -142,7 +143,7 @@ def nextcloud_insert(doc, method=None): permit = 1 data_json = nc.ocs.createShare(pathglobal,shareType,shareWith=module,publicUpload=True,password=None,permissions=permit) # add public Share in Nextcloud - if nc.sharepublic: + if nc.sharepublic or doc.is_private == False: shareType = 3 data_json = nc.ocs.createShare(pathglobal,shareType) if data_json == "": @@ -151,7 +152,7 @@ def nextcloud_insert(doc, method=None): data_string = json.dumps(data_json) decoded = json.loads(data_string) fileid = str(decoded["ocs"]["data"]["file_source"]) - if nc.sharepublic: + if nc.sharepublic or doc.is_private == False: urllink = str(decoded["ocs"]["data"]["url"]) else: urllink = nc.url + "/f/" + fileid diff --git a/pibiapp/nextcloud/tagpropfind.xml b/pibiapp/nextcloud/tagpropfind.xml old mode 100644 new mode 100755