\n \n \n \n \n \n \n $baseDir . '/core/Migrations/Version14000Date20180712153140.php',
'OC\\Core\\Migrations\\Version15000Date20180926101451' => $baseDir . '/core/Migrations/Version15000Date20180926101451.php',
'OC\\Core\\Migrations\\Version15000Date20181015062942' => $baseDir . '/core/Migrations/Version15000Date20181015062942.php',
+ 'OC\\Core\\Migrations\\Version15000Date20181029084625' => $baseDir . '/core/Migrations/Version15000Date20181029084625.php',
'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php',
'OC\\DB\\AdapterMySQL' => $baseDir . '/lib/private/DB/AdapterMySQL.php',
'OC\\DB\\AdapterOCI8' => $baseDir . '/lib/private/DB/AdapterOCI8.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 2a46e99e02057..6518569da049d 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -701,6 +701,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Core\\Migrations\\Version14000Date20180712153140' => __DIR__ . '/../../..' . '/core/Migrations/Version14000Date20180712153140.php',
'OC\\Core\\Migrations\\Version15000Date20180926101451' => __DIR__ . '/../../..' . '/core/Migrations/Version15000Date20180926101451.php',
'OC\\Core\\Migrations\\Version15000Date20181015062942' => __DIR__ . '/../../..' . '/core/Migrations/Version15000Date20181015062942.php',
+ 'OC\\Core\\Migrations\\Version15000Date20181029084625' => __DIR__ . '/../../..' . '/core/Migrations/Version15000Date20181029084625.php',
'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php',
'OC\\DB\\AdapterMySQL' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterMySQL.php',
'OC\\DB\\AdapterOCI8' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterOCI8.php',
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index 3dcca0facbcc6..50111054546c8 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -146,6 +146,8 @@ public function create(\OCP\Share\IShare $share) {
//Set the GID of the group we share with
$qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+ //set label for public link
+ $qb->setValue('label', $qb->createNamedParameter($share->getLabel()));
//Set the token of the share
$qb->setValue('token', $qb->createNamedParameter($share->getToken()));
@@ -225,6 +227,9 @@ public function create(\OCP\Share\IShare $share) {
*
* @param \OCP\Share\IShare $share
* @return \OCP\Share\IShare The share object
+ * @throws ShareNotFound
+ * @throws \OCP\Files\InvalidPathException
+ * @throws \OCP\Files\NotFoundException
*/
public function update(\OCP\Share\IShare $share) {
@@ -296,6 +301,7 @@ public function update(\OCP\Share\IShare $share) {
->set('token', $qb->createNamedParameter($share->getToken()))
->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
->set('note', $qb->createNamedParameter($share->getNote()))
+ ->set('label', $qb->createNamedParameter($share->getLabel()))
->set('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0), IQueryBuilder::PARAM_INT)
->execute();
}
@@ -919,7 +925,8 @@ private function createShare($data) {
->setPermissions((int)$data['permissions'])
->setTarget($data['file_target'])
->setNote($data['note'])
- ->setMailSend((bool)$data['mail_send']);
+ ->setMailSend((bool)$data['mail_send'])
+ ->setLabel($data['label']);
$shareTime = new \DateTime();
$shareTime->setTimestamp((int)$data['stime']);
diff --git a/lib/private/Share20/Share.php b/lib/private/Share20/Share.php
index e218360f87b53..f9b548c1adf98 100644
--- a/lib/private/Share20/Share.php
+++ b/lib/private/Share20/Share.php
@@ -76,6 +76,8 @@ class Share implements \OCP\Share\IShare {
private $shareTime;
/** @var bool */
private $mailSend;
+ /** @var string */
+ private $label = '';
/** @var IRootFolder */
private $rootFolder;
@@ -334,6 +336,21 @@ public function getNote() {
return '';
}
+ /**
+ * @inheritdoc
+ */
+ public function setLabel($label) {
+ $this->label = $label;
+ return $this;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getLabel() {
+ return $this->label;
+ }
+
/**
* @inheritdoc
*/
diff --git a/lib/public/Share/IShare.php b/lib/public/Share/IShare.php
index dcd5fdecbea57..7bcecbdc872db 100644
--- a/lib/public/Share/IShare.php
+++ b/lib/public/Share/IShare.php
@@ -257,6 +257,23 @@ public function setExpirationDate($expireDate);
*/
public function getExpirationDate();
+ /**
+ * set a label for a share, some shares, e.g. public links can have a label
+ *
+ * @param string $label
+ * @return \OCP\Share\IShare The modified object
+ * @since 15.0.0
+ */
+ public function setLabel($label);
+
+ /**
+ * get label for the share, some shares, e.g. public links can have a label
+ *
+ * @return string
+ * @since 15.0.0
+ */
+ public function getLabel();
+
/**
* Set the sharer of the path.
*
diff --git a/tests/acceptance/features/bootstrap/FilesAppContext.php b/tests/acceptance/features/bootstrap/FilesAppContext.php
index 4b648bfc5443b..459028813b5ca 100644
--- a/tests/acceptance/features/bootstrap/FilesAppContext.php
+++ b/tests/acceptance/features/bootstrap/FilesAppContext.php
@@ -188,7 +188,7 @@ public static function loadingIconForTabInDetailsViewNamed($tabName) {
* @return Locator
*/
public static function shareLinkRow() {
- return Locator::forThe()->id("shareLink")->
+ return Locator::forThe()->css(".linkShareView .shareWithList:first-child")->
descendantOf(self::detailsView())->
describedAs("Share link row in the details view in Files app");
}
@@ -196,13 +196,21 @@ public static function shareLinkRow() {
/**
* @return Locator
*/
- public static function shareLinkCheckbox() {
- // forThe()->checkbox("Enable") can not be used here; that would return
- // the checkbox itself, but the element that the user interacts with is
- // the label.
- return Locator::forThe()->xpath("//label[normalize-space() = 'Enable']")->
+ public static function shareLinkAddNewButton() {
+ // When there is no link share the "Add new share" item is shown instead
+ // of the menu button as a direct child of ".share-menu".
+ return Locator::forThe()->css(".share-menu > .new-share")->
descendantOf(self::shareLinkRow())->
- describedAs("Share link checkbox in the details view in Files app");
+ describedAs("Add new share link button in the details view in Files app");
+ }
+
+ /**
+ * @return Locator
+ */
+ public static function copyLinkButton() {
+ return Locator::forThe()->css("a.clipboard-button")->
+ descendantOf(self::shareLinkRow())->
+ describedAs("Copy link button in the details view in Files app");
}
/**
@@ -223,15 +231,6 @@ public static function shareLinkMenu() {
describedAs("Share link menu in the details view in Files app");
}
- /**
- * @return Locator
- */
- public static function copyUrlMenuItem() {
- return Locator::forThe()->xpath("//a[normalize-space() = 'Copy link']")->
- descendantOf(self::shareLinkMenu())->
- describedAs("Copy link menu item in the share link menu in the details view in Files app");
- }
-
/**
* @return Locator
*/
@@ -320,21 +319,19 @@ public function iOpenTheTabInTheDetailsView($tabName) {
public function iShareTheLinkFor($fileName) {
$this->actor->find(FileListContext::shareActionForFile(self::currentSectionMainView(), $fileName), 10)->click();
- $this->actor->find(self::shareLinkCheckbox(), 5)->click();
+ $this->actor->find(self::shareLinkAddNewButton(), 5)->click();
}
/**
* @Given I write down the shared link
*/
public function iWriteDownTheSharedLink() {
- $this->showShareLinkMenuIfNeeded();
-
- $this->actor->find(self::copyUrlMenuItem(), 2)->click();
+ $this->actor->find(self::copyLinkButton(), 10)->click();
// Clicking on the menu item copies the link to the clipboard, but it is
// not possible to access that value from the acceptance tests. Due to
// this the value of the attribute that holds the URL is used instead.
- $this->actor->getSharedNotebook()["shared link"] = $this->actor->find(self::copyUrlMenuItem(), 2)->getWrappedElement()->getAttribute("data-clipboard-text");
+ $this->actor->getSharedNotebook()["shared link"] = $this->actor->find(self::copyLinkButton(), 2)->getWrappedElement()->getAttribute("data-clipboard-text");
}
/**
diff --git a/version.php b/version.php
index 93a8b5fd53e63..235e18bf61d8a 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
-$OC_Version = array(15, 0, 0, 2);
+$OC_Version = array(15, 0, 0, 3);
// The human readable string
$OC_VersionString = '15.0.0 alpha';