Request 2565 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 2565 (accepted)

Check in 0.5.6

Created by vanmeeuwen over 5 years ago
In state accepted

Submit chwala

Submit package Kolab:Winterfell / chwala to package Kolab:16 / chwala

chwala.spec Changed

0001-Mark-readonly-virtual-entries-in-folder-selector-as-.patch Deleted

@@ -1,42 +0,0 @@
-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 = '&nbsp;&nbsp;&nbsp;' + 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
-

0002-Seafile-Fix-folder-hierarchy-flattened-above-3rd-lev.patch Deleted

@@ -1,26 +0,0 @@
-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
-

chwala-0.5.5.tar.gz -> chwala-0.5.6.tar.gz Changed

chwala.dsc Changed

debian.changelog Changed

debian.tar.gz/postinst Changed

Build Results
RPM Lint

Refresh

Comments for request 2565 0

Request History

vanmeeuwen created request over 5 years ago

Check in 0.5.6

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago