Commit graph

251 commits

Author SHA1 Message Date
Vincent Petry
8ddff52c51 Do not show recipient for link shares in file list
In the "Shared with link" section, the share_with field can contain a
value when a password was set.

This fix prevents this value to be shown as it is not intended for the
end user.
2014-07-07 16:33:23 +02:00
Bjoern Schiessle
3b9fa81581 if a folder gets deleted we unshare all shared files/folders below 2014-07-04 10:34:54 +02:00
Vincent Petry
615d037d3e Merge pull request #9364 from owncloud/sharing_rename_mount_points
[sharing] rename mount point of children if parent was renamed
2014-07-02 18:48:07 +02:00
Vincent Petry
f4eb90e229 Merge pull request #9311 from owncloud/storage-not-available
Handle storages not being available in webui and webdav
2014-07-02 18:15:58 +02:00
Bjoern Schiessle
ea31ab7b5c rename mount point of children if parent was renamed 2014-07-02 15:39:38 +02:00
Robin Appelman
0008db9995 Fix unit test 2014-07-02 14:39:45 +02:00
Vincent Petry
025b71d068 Use fileActionsReady to re-render sharing icons
Whenever file actions are modified, either by registering new actions or
when appending a new page of entries, the sharing app is now notified so
it can correctly refresh the sharing icon status.

Additionally, the core's loadIcons() method is also used to load the
existing shares and also refresh the sharing icons afterwards.
2014-07-01 21:32:04 +02:00
Jan-Christoph Borchardt
b7cb4f5a63 fix trailing whitespace noted by Scrutinizer 2014-06-27 18:25:56 +02:00
Vincent Petry
586b3a9683 Sync file list with file actions
Whenever file actions are registered later, now the file lists are
automatically notified.

Added FileActions.addUpdateListener() to be able to receive such
notifications.

This removes the need for apps to manually call FileActions.display()
after registering new actions.

This fixes issues with race conditions when file actions are
registered after the file list was already rendered.
2014-06-27 13:41:01 +02:00
Thomas Müller
ef4057d382 remove pointless require - we should kill all require_once like that in our tests 2014-06-27 09:30:42 +02:00
Björn Schießle
1822bba5e9 Merge pull request #9193 from owncloud/sharing_etag_propagation
make sure that the etags get propagated correctly
2014-06-26 10:26:24 +02:00
Vincent Petry
93a6792da7 Merge pull request #9205 from owncloud/remoteshare-fixurlpath
Fix parsing of remote URL when mounting remote shares
2014-06-25 19:59:39 +02:00
Bjoern Schiessle
38ff8173ab make sure that hooks are registered for the tests 2014-06-25 15:20:52 +02:00
Vincent Petry
d22559200c Fix parsing of remote URL when mounting remote shares
This fix allows for having the remote ownCloud instance live in a
subpath like "http://example.com/basedir/subdir/owncloud".
Such URLs are now parsed correctly.

Added unit test for URL parsing.
2014-06-25 15:11:43 +02:00
Bjoern Schiessle
a0b85fc5e4 make sure that during share and unshare the etags get propagated correctly 2014-06-25 12:11:56 +02:00
Bjoern Schiessle
3fc7357ade add/update unit tests 2014-06-24 14:00:15 +02:00
Vincent Petry
75a53b3c49 Merge pull request #8901 from owncloud/permissions-update-cache
Save the permissions in the filecache if it's not saved yet
2014-06-11 18:28:55 +02:00
Bjoern Schiessle
1d9b4aadbf no need to prepare a statement twice 2014-06-10 14:46:47 +02:00
Thomas Müller
961e4e5c7c adjust unit test assert values 2014-06-09 12:44:40 +02:00
Thomas Müller
aa38bd2b31 adding PHPDoc 2014-06-09 12:34:35 +02:00
Bjoern Schiessle
86d7371d0c fix unshareFromSelf() 2014-06-06 09:56:02 +02:00
Bjoern Schiessle
09970e1816 update unit tests and make sure that we return the right permissions for files within a shared folder and for the shared folder itself 2014-06-06 09:56:02 +02:00
Bjoern Schiessle
ca6631a710 add some tests 2014-06-06 09:56:01 +02:00
Robin Appelman
42a362f249 Fix phpdoc and comments 2014-06-06 09:56:01 +02:00
Bjoern Schiessle
501f98f084 update share API tests, file shares never have delete permissions 2014-06-06 09:56:00 +02:00
Bjoern Schiessle
844b1e3fc6 add additional unit tests 2014-06-06 09:56:00 +02:00
Bjoern Schiessle
bf5e9357fc don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it 2014-06-06 09:55:59 +02:00
Vincent Petry
e0c4e960d9 Merge pull request #8861 from owncloud/share-overview-linklist
Added Shared with link sidebar section in files app
2014-06-05 10:59:54 +02:00
Morris Jobke
ca43fba513 Merge pull request #8791 from owncloud/share-overview-sharewithstatus
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
Vincent Petry
b3fdda1751 Added "Shared with link" sidebar section in files app
Added section to only show link shares.

Please note that the filtering is currently done on the client side
which might not be the most efficient way of doing it.
2014-06-04 11:10:11 +02:00
Vincent Petry
07f1b263c9 Use recipient display names when updating shares in the UI
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.

The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
2014-06-04 10:37:04 +02:00
Vincent Petry
1297b2b883 Multiple fixes to sharing overview
- scrolling to next page now correctly renders share icons
- reshareing/unsharing a reshare will now still keep "Shared by" label
2014-06-03 11:04:57 +02:00
Vincent Petry
640fbc016d Now using shareOwner for the share owner
Makes it consistent with the regular file list fileData
2014-06-02 18:52:31 +02:00
Morris Jobke
da090099f4 fix unit tests 2014-06-02 18:39:52 +02:00
Vincent Petry
0944565f60 More unit tests and fixes for share 2014-06-02 18:08:56 +02:00
Vincent Petry
d677e3860d Added unit tests for share.js and share icon 2014-06-02 15:59:06 +02:00
Vincent Petry
5e4e773446 Removed "Share with" column 2014-05-30 10:06:30 +02:00
Vincent Petry
e084183d1e Added owner display name in action 2014-05-30 10:06:29 +02:00
Vincent Petry
1d9129eac3 Sharing overview fixes and unit tests
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
2014-05-30 10:06:29 +02:00
Bjoern Schiessle
95bd7fee9c don't lose file size during rename 2014-05-26 14:11:33 +02:00
Bjoern Schiessle
12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Bjoern Schiessle
5f403f3e92 move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists 2014-05-21 13:19:17 +02:00
Morris Jobke
dc36d30953 Remove all occurences of @brief and @returns from PHPDoc
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Robin McCorkell
e7aebc5c32 Fix whitespace issues 2014-05-16 22:23:36 +01:00
Robin McCorkell
c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Björn Schießle
42b99b6d0f Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links
use default expire date only for link shares
2014-05-16 14:57:11 -04:00
Bjoern Schiessle
7a48f24459 use default expire date only for link shares 2014-05-16 18:12:13 +02:00
Bjoern Schiessle
b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Thomas Müller
e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Vincent Petry
f73a168694 Added unit test for sharing ext storage mount points 2014-05-08 11:00:19 +02:00
Bjoern Schiessle
20e4ad382b get the correct owner path for part files 2014-04-30 12:49:16 +02:00
Bjoern Schiessle
b102222fed split-up the update script and add unit tests for it 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
fb88aba8f4 some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
d468cdacf2 add unit tests which got lost during rebase 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
652d417a58 we don't allow to share a folder if it contains a share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
ed981294f1 fix share api tests 2014-04-23 12:54:25 +02:00
Robin Appelman
7dafdfbe88 add tests for sharing files the users doesn't have access to 2014-04-03 13:14:34 +02:00
Vincent Petry
d811026ec9 Merge pull request #7935 from owncloud/getpath-shared
Make getPath work for shared files
2014-04-01 21:59:09 +02:00
Vincent Petry
27eff1ac30 Merge pull request #7293 from owncloud/update-shares-postgres
fix update to remove shares where file doesn't exist on postgres
2014-04-01 14:56:37 +02:00
Robin Appelman
fe78d963d9 Implement getPath for shared files 2014-03-28 15:26:15 +01:00
Vincent Petry
cbfd16089b Fixed share upgrade cleanup tests to use the correct ids 2014-03-26 09:29:28 +01:00
Vincent Petry
ec9260647a Fixed share updater unit test
Now using \OC_DB::insertId() to retrieve the generated ids because
Oracle ignores the passed values.
2014-03-25 20:18:58 +01:00
Bjoern Schiessle
31681a3a27 finally fix the paths for the OCS Share API 2014-03-25 17:52:45 +01:00
Bjoern Schiessle
3653a51af2 fix path creation for re-shares, issue #7662 2014-03-25 17:48:50 +01:00
Bjoern Schiessle
9d32475260 finally fix the paths for the OCS Share API 2014-03-13 15:16:59 +01:00
Vincent Petry
02be15ce2f Added backticks for Oracle in sharing updater unit test 2014-03-13 13:09:32 +01:00
Morris Jobke
4bb303cbd6 Clean up database before setup the database for testing 2014-03-13 13:09:32 +01:00
Morris Jobke
ec54bc7709 Refactor update script to class and add unit test 2014-03-13 13:09:32 +01:00
Bjoern Schiessle
36885dc64c fix path creation for re-shares, issue #7662 2014-03-11 12:58:46 +01:00
Bjoern Schiessle
9548670da7 we need the file_source to delete a share successfully 2014-03-10 11:35:54 +01:00
Bjoern Schiessle
e3f676e009 fix path in sharing results if it is a file in the Shared folder 2014-02-25 17:27:23 +01:00
Bjoern Schiessle
0c0e4fced5 fix test so that it doesn't depend on the array order 2014-02-21 13:37:47 +01:00
Bjoern Schiessle
6ca4d3bfde fix usersPath and add unit tests 2014-02-21 13:37:46 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Vincent Petry
fa5ddc3e18 Fixed searchByMime in shared cache
- searchByMime now correctly returns files recursively search through
  all the dirs
- added unit test for searchByMime
2014-02-05 13:29:06 +01:00
Vincent Petry
963ee31efb Removed numRows usage from encryption app
numRows on Oracle always seem to return 0.

This fix removes numRows usage from the encryption and sharing app.

This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
2013-12-19 15:51:24 +01:00
Vincent Petry
e9255e5d57 Added unit test for sharing permissions 2013-12-10 11:19:09 +01:00
Vincent Petry
da126f1692 Fixed unit tests for files sharing watcher 2013-11-06 09:39:52 +01:00
Vincent Petry
9f4fd0161e Added unit tests for shared files watcher
- Added base class for sharing unit tests
- Added unit tests for shared files watched to check for folder size
  propagation
2013-11-05 19:30:52 +01:00
Bjoern Schiessle
99738ae0bc add test for the reshare option 2013-10-17 12:23:37 +02:00
Bjoern Schiessle
ab6ee79e11 adjust tests 2013-10-17 11:23:07 +02:00
Björn Schießle
a6d9319328 Merge pull request #5269 from owncloud/ocs_share_api_add_received_from
ocs share api: add "received_from" and "received_from_displayname" field
2013-10-15 02:17:23 -07:00
Björn Schießle
4336d42ab0 Merge pull request #5233 from owncloud/enc_filter_users
only encrypt file to users with encryption keys
2013-10-11 01:48:02 -07:00
Bjoern Schiessle
7a1705d28e fix api tests 2013-10-11 10:28:01 +02:00
Bjoern Schiessle
a1719deabe make sure that we are logged in ad user1 while performing the tests 2013-10-10 10:47:35 +02:00
Thomas Müller
8a06f2e128 php 5.3 compatibility for Test_Files_Sharing_Api 2013-10-08 23:05:19 +02:00
Bjoern Schiessle
2e7f481e6b update tests 2013-10-04 14:32:15 +02:00
Bjoern Schiessle
6d830087db add testUpdateShareUpload() 2013-09-30 12:57:55 +02:00
Bjoern Schiessle
03db954e1a add getShareFromFolder() test 2013-09-30 12:38:36 +02:00
Bjoern Schiessle
9a2e82c3c5 Make sure that testDeleteShare() has some shares to delete 2013-09-30 12:23:44 +02:00
Thomas Müller
258e8d58da flipping arguments on assertEquals() - first argument contains the expected value and second argument contains the value to be asserted 2013-09-29 22:20:42 +02:00
Thomas Müller
63ea6844e8 - adding unit test testGetShareFromUnknownId()
- fixing getShareFromId() for Oracle
- fixing error message
2013-09-29 22:16:48 +02:00
Bjoern Schiessle
f935a38559 add some comments 2013-09-27 14:04:28 +02:00
Bjoern Schiessle
5b4f515e7b add test getShareFromId 2013-09-27 14:01:04 +02:00
Bjoern Schiessle
4077ed6ddb add some additional assertions to the tests 2013-09-25 15:05:23 +02:00
Thomas Müller
333d3eda99 add error message to the assert 2013-09-25 09:43:16 +02:00
Bjoern Schiessle
7626540679 make sure that files are shared correctly before each test and unshared again after the test 2013-09-20 12:38:23 +02:00
Bjoern Schiessle
bd09910f67 disable encrpytion app before performing tests 2013-09-20 11:24:18 +02:00
Bjoern Schiessle
57092e817f disable encryption app for share API tests 2013-09-19 20:14:34 +02:00
Bjoern Schiessle
8cf8c0b161 remove some unused variables 2013-09-19 14:42:34 +02:00
Bjoern Schiessle
b947aab802 some unit test for the new ocs share api 2013-09-19 14:39:51 +02:00