diff --git a/CHANGELOG.md b/CHANGELOG.md index 40487e75..23fb4c1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 1.1.3 +## Added +- fixing bug + ## 1.1.2 ## Added - translation diff --git a/appinfo/info.xml b/appinfo/info.xml index 55cfcdae..fb4c0a16 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -7,7 +7,7 @@ ONLYOFFICE integration app enables users to edit Office documents within ONLYOFFICE from OwnCloud. This will create a new Open in ONLYOFFICE action within the document library for Office documents. This allows multiple users to collaborate in real time and to save back those changes to OwnCloud. AGPL Ascensio System SIA - 1.1.2 + 1.1.3 Onlyoffice @@ -24,8 +24,6 @@ https://github.com/ONLYOFFICE/onlyoffice-owncloud/issues https://github.com/ONLYOFFICE/onlyoffice-owncloud.git https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/main.png - https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/new.png - https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/open.png https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/settings.png diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php index b53c68cb..72f38627 100644 --- a/controller/editorcontroller.php +++ b/controller/editorcontroller.php @@ -366,7 +366,7 @@ public function config($fileId) { $key = $this->getKey($file); $canEdit = isset($format["edit"]) && $format["edit"]; - $callback = ($file->isUpdateable() && $canEdit ? $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.track", ["doc" => $hashCallback]) : NULL); + $callback = ($file->isUpdateable() && $canEdit ? $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.track", ["doc" => $hashCallback]) : ""); if (!empty($this->config->GetStorageUrl())) { $callback = str_replace($this->urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $callback); @@ -383,7 +383,7 @@ public function config($fileId) { "editorConfig" => [ "callbackUrl" => $callback, "lang" => \OC::$server->getL10NFactory("")->get("")->getLanguageCode(), - "mode" => ($callback === NULL ? "view" : "edit"), + "mode" => (empty($callback) ? "view" : "edit"), "user" => [ "id" => $userId, "name" => $this->userSession->getUser()->getDisplayName() diff --git a/screenshots/main.png b/screenshots/main.png index 43e5017e..d7f7c189 100644 Binary files a/screenshots/main.png and b/screenshots/main.png differ diff --git a/screenshots/main_small.png b/screenshots/main_small.png index 1a9659ea..c80dfe20 100644 Binary files a/screenshots/main_small.png and b/screenshots/main_small.png differ diff --git a/screenshots/new.png b/screenshots/new.png deleted file mode 100644 index e25c9394..00000000 Binary files a/screenshots/new.png and /dev/null differ diff --git a/screenshots/open.png b/screenshots/open.png deleted file mode 100644 index 3ab459f4..00000000 Binary files a/screenshots/open.png and /dev/null differ diff --git a/screenshots/settings.png b/screenshots/settings.png index dd760ddb..2dc9f499 100644 Binary files a/screenshots/settings.png and b/screenshots/settings.png differ