Projects
Kolab:16:Enterprise
chwala
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 23
View file
chwala.spec
Changed
@@ -49,6 +49,9 @@ Patch1: chwala-0.5.4-suhosin.session.encrypt-php_flag.patch +Patch0001: 0001-Mark-readonly-virtual-entries-in-folder-selector-as-.patch +Patch0002: 0002-Seafile-Fix-folder-hierarchy-flattened-above-3rd-lev.patch + BuildArch: noarch Requires: php-pear(HTTP_Request2) @@ -83,6 +86,9 @@ %patch1 -p1 +%patch0001 -p1 +%patch0002 -p1 + %build %install
View file
0001-Mark-readonly-virtual-entries-in-folder-selector-as-.patch
Added
@@ -0,0 +1,42 @@ +From dd1d166dbb298ff3f5f0e49cf967eefcddf05ba5 Mon Sep 17 00:00:00 2001 +From: Aleksander Machniak <machniak@kolabsys.com> +Date: Mon, 18 Mar 2019 10:03:11 +0100 +Subject: PATCH 1/2 Mark readonly/virtual entries in folder selector as + disabled + +--- + public_html/js/files_api.js | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/public_html/js/files_api.js b/public_html/js/files_api.js +index 823838c..5bc77d3 100644 +--- a/public_html/js/files_api.js ++++ b/public_html/js/files_api.js +@@ -214,7 +214,7 @@ function files_api() + options.push($('<option>').val('').text('---')); + + $.each(this.env.folders, function(i, f) { +- var n, name = escapeHTML(f.name); ++ var n, disabled = false, name = escapeHTML(f.name); + + // skip read-only folders + if (params && params.writable && (f.readonly || f.virtual)) { +@@ -233,12 +233,14 @@ function files_api() + + if (!found) + return; ++ ++ disabled = true; + } + + for (n=0; n<f.depth; n++) + name = ' ' + name; + +- options.push($('<option>').val(i).html(name)); ++ options.push($('<option>').val(i).html(name).attr('disabled', disabled)); + }); + + select.empty().append(options); +-- +2.20.1 +
View file
0002-Seafile-Fix-folder-hierarchy-flattened-above-3rd-lev.patch
Added
@@ -0,0 +1,26 @@ +From b58c8aedbd73062b36624521fd9ca89fbfa028bd Mon Sep 17 00:00:00 2001 +From: Aleksander Machniak <machniak@kolabsys.com> +Date: Wed, 20 Mar 2019 11:54:55 +0100 +Subject: PATCH 2/2 Seafile: Fix folder hierarchy flattened above 3rd level + (Bifrost#T193526) + +--- + lib/drivers/seafile/seafile_file_storage.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/drivers/seafile/seafile_file_storage.php b/lib/drivers/seafile/seafile_file_storage.php +index 6edc5fc..e7fbe88 100644 +--- a/lib/drivers/seafile/seafile_file_storage.php ++++ b/lib/drivers/seafile/seafile_file_storage.php +@@ -1494,7 +1494,7 @@ class seafile_file_storage implements file_storage + if (empty($params'recursive') && empty($params'level')) { + if ($content = $this->api->directory_entries($library'id', $root, 'dir', true)) { + foreach ($content as $item) { +- $add_folder($item, $folders, $root); ++ $add_folder($item, $folders, trim($item'parent_dir', '/')); + } + } + } +-- +2.20.1 +
View file
chwala.dsc
Changed
@@ -2,7 +2,7 @@ Source: chwala Binary: chwala Architecture: all -Version: 0.5.5-0~kolab1 +Version: 0.5.5-0~kolab2 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl> Homepage: http://kolab.org/about/chwala/
View file
debian.changelog
Changed
@@ -1,8 +1,8 @@ -chwala (0.5.5-0~kolab1) unsable; urgency=low +chwala (0.5.5-0~kolab2) unsable; urgency=low * Release version 0.5.5 - -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabys.com> Thu, 14 Mar 2019 12:12:12 +0100 + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabys.com> Wed, 20 Mar 2019 12:12:12 +0100 chwala (0.5.4-0~kolab1) unsable; urgency=low
View file
debian.series
Changed
@@ -1,2 +1,4 @@ chwala-0.5.4-suhosin.session.encrypt-php_flag.patch -p1 fix-autoload-path-debian.patch -p1 +0001-Mark-readonly-virtual-entries-in-folder-selector-as-.patch -p1 +0002-Seafile-Fix-folder-hierarchy-flattened-above-3rd-lev.patch -p1
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.