Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-final-new into lp:ubuntu-filemanager-app

Proposed by Carlos Jose Mazieri on 2015-06-20
Status: Merged
Approved by: Arto Jalkanen on 2015-06-21
Approved revision: 424
Merged at revision: 424
Proposed branch: lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-final-new
Merge into: lp:ubuntu-filemanager-app
Prerequisite: lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-13-new
Diff against target: 12 lines (+1/-1)
1 file modified
src/app/qml/ui/FolderListPage.qml (+1/-1)
To merge this branch: bzr merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-final-new
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-20
Ubuntu File Manager Developers 2015-06-20 Pending
Review via email:

Commit message

It allows the filemager to browse Samba items by entering any valid url starting with "smb://" or "cifs://".

Description of the change

It replaces

It allows the filemager to browse Samba items by entering any valid url starting with "smb://" or "cifs://".

To test: Menu -> GoTo, type smb:// or cifs://

The property "isDir" should be changed in some places to "isBrowsable", the difference is that "isDir" allows remove/copy/cut while "isBrowsable" just means the item is a container and may have sub items.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/ui/FolderListPage.qml'
2--- src/app/qml/ui/FolderListPage.qml 2015-03-04 10:02:30 +0000
3+++ src/app/qml/ui/FolderListPage.qml 2015-06-20 19:32:16 +0000
4@@ -888,7 +888,7 @@
5 }
7 function itemClicked(model) {
8- if (model.isDir) {
9+ if (model.isBrowsable) {
10 if (model.isReadable && model.isExecutable) {
11 console.log("Changing to dir", model.filePath)
12 goTo(model.filePath)


People subscribed via source and target branches