diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php index a811843ce..3e646bb51 100644 --- a/application/controllers/api/frontend/v1/Bookmark.php +++ b/application/controllers/api/frontend/v1/Bookmark.php @@ -30,6 +30,7 @@ class Bookmark extends FHCAPI_Controller 'getBookmarks' => self::PERM_LOGGED, 'delete' => self::PERM_LOGGED, 'insert' => self::PERM_LOGGED, + 'update' => self::PERM_LOGGED, ]); $this->load->model('dashboard/Bookmark_model', 'BookmarkModel'); @@ -50,7 +51,8 @@ class Bookmark extends FHCAPI_Controller */ public function getBookmarks() { - $bookmarks = $this->BookmarkModel->loadWhere(["uid"=>$this->uid]); + $this->BookmarkModel->addOrder("bookmark_id"); + $bookmarks = $this->BookmarkModel->loadWhere(["uid"=>$this->uid]); $bookmarks = $this->getDataOrTerminateWithError($bookmarks); @@ -104,6 +106,33 @@ class Bookmark extends FHCAPI_Controller $this->terminateWithSuccess($insert_into_result); + } + + /** + * updates bookmark in the bookmark table + * @access public + * @return void + */ + public function update($bookmark_id) + { + // form validation + $this->load->library('form_validation'); + $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]'); + $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]'); + if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array()); + + $url = $this->input->post('url',true); + $title = $this->input->post('title',true); + + $now = new DateTime(); + $now = $now->format('Y-m-d H:i:s'); + + $update_result = $this->BookmarkModel->update($bookmark_id,['url'=>$url, 'title'=>$title,'updateamum'=>$now]); + + $update_result = $this->getDataOrTerminateWithError($update_result); + + $this->terminateWithSuccess($update_result); + } } diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php index f1fe380de..b8937a1f4 100644 --- a/application/controllers/api/frontend/v1/Cms.php +++ b/application/controllers/api/frontend/v1/Cms.php @@ -124,25 +124,35 @@ class Cms extends FHCAPI_Controller //get the data or terminate with error $news = $this->getDataOrTerminateWithError($news); - + // array that keeps track of which news don't have a betreff and have to be removed from the news array + $newsToRemove = array(); // collect the content of the news - foreach($news as $news_element){ - $this->addMeta("content_id",$news_element->content_id); + foreach($news as $index=>$news_element){ - //todo: quick fix, for query builder error when fetching content $this->NewsModel->resetQuery(); $content = $this->cmslib->getContent($news_element->content_id); - - $content = getData($content); - - $news_element->content_obj = $content; + if(isError($content)) + { + // removes the news from the news array, so that the response does not include a invalid news + array_push($newsToRemove,$index); + //add the error to the api response? visual feedback + //$this->addError(print_r($content->retval,true)); + continue; + } + $content = getData($content); + $news_element->content_obj = $content; } + + //removes all news that don't have a betreff + foreach($newsToRemove as $removeNewsIndex) + { + unset($news[$removeNewsIndex]); + } + $withContent = function($news) { return $news->content_obj != null; - }; - + }; $newsWithContent = array_filter($news, $withContent); - $this->terminateWithSuccess($newsWithContent); } diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php index 60e982eab..355cf7c56 100644 --- a/application/libraries/CmsLib.php +++ b/application/libraries/CmsLib.php @@ -43,7 +43,7 @@ class CmsLib * @param string $sprache * @param boolean $sichtbar * - * @return void + * @return stdClass */ public function getContent($content_id, $version = null, $sprache = null, $sichtbar = true) { @@ -105,7 +105,19 @@ class CmsLib if($content->titel){ $betreff = $content->titel; }else{ + //DomDocument getElementsByTagName returns a DomNodeList $betreff = $XML->getElementsByTagName('betreff'); + //check if any betreff was found and if it is not empty + if($betreff->length > 0 && !empty($betreff->item(0)->nodeValue)) + { + //DomNodeList item() return a DomNode, property nodeValue contains the value of the node + $betreff = $betreff->item(0)->nodeValue; + + } + else + { + return error('no betreff found for the content'); + } } $xsltemplate = new DOMDocument(); diff --git a/public/js/api/bookmark.js b/public/js/api/bookmark.js index 30e49d50d..5cef0a46b 100644 --- a/public/js/api/bookmark.js +++ b/public/js/api/bookmark.js @@ -14,6 +14,16 @@ export default { ); }, + update: function ({ bookmark_id, url, title, tag=null}) { + return this.$fhcApi.post( + `/api/frontend/v1/Bookmark/update/${bookmark_id}` + , { + url: url, + title: title + } + ); + }, + insert: function ({url, title, tag}) { return this.$fhcApi.post( `/api/frontend/v1/Bookmark/insert` diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js index c29f538e4..a459e1325 100644 --- a/public/js/components/DashboardWidget/News.js +++ b/public/js/components/DashboardWidget/News.js @@ -39,6 +39,9 @@ export default { } }, methods: { + isString(value){ + return Object.prototype.toString.call(value) === '[object String]'; + }, setNext(){ const thisIndex = this.allNewsList.findIndex(n=>n.news_id == this.selected.news_id) const nextIndex = thisIndex == (this.allNewsList.length - 1) ? 0 : thisIndex + 1 @@ -175,13 +178,16 @@ export default {
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js index 3a64dcc92..eaf42ab2d 100644 --- a/public/js/components/DashboardWidget/Url.js +++ b/public/js/components/DashboardWidget/Url.js @@ -1,3 +1,6 @@ +import CoreForm from "../Form/Form.js"; +import FormInput from "../Form/Input.js"; +import BsModal from "../Bootstrap/Modal.js"; import AbstractWidget from './Abstract'; export default { @@ -9,13 +12,19 @@ export default { default: false } }, + components:{ + CoreForm, + FormInput, + BsModal + }, data: () => ({ + bookmark_id: null, title_input: "", url_input: "", validation: { invalidURL: false, invalidTitel: false, - } + }, }), computed: { @@ -33,6 +42,74 @@ export default { }, }, methods: { + stopDrag(event){ + event.preventDefault(); + }, + clearInputs(){ + this.title_input = ""; + this.url_input = ""; + }, + openCreateModal() { + this.$refs.createModal.show() + }, + openEditModal(bookmark) { + this.title_input = bookmark.title; + this.url_input = bookmark.url; + this.bookmark_id = bookmark.bookmark_id; + this.$refs.editModal.show() + }, + editBookmark(event){ + event.preventDefault(); + if(!this.bookmark_id || !this.url_input || !this.title_input) return; + + this.$fhcApi.factory.bookmark + .update({ + bookmark_id: this.bookmark_id, + title: this.title_input, + url: this.url_input, + }) + .then((res) => res.data) + .then((result) => { + this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkUpdated")); + // refetch the bookmarks to see the updates + this.fetchBookmarks(); + // reset the values for the title and url inputs + this.clearInputs(); + this.$refs.editModal.hide(); + this.bookmark_id = null; + }) + .catch(this.$fhcAlert.handleSystemError); + }, + + insertBookmark(event) { + event.preventDefault(); + + // reset is-invalid css on url input field + for (let key of Object.keys(this.validation)) { + this.validation[key] = false; + } + + // early return if validation failed + if (!this.isValidationSuccessfull()) return; + + this.$fhcApi.factory.bookmark + .insert({ + tag: this.config.tag, + title: this.title_input, + url: this.url_input, + }) + .then((res) => res.data) + .then((result) => { + this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkAdded")); + // refetch the bookmarks to see the updates + this.fetchBookmarks(); + this.$refs.createModal.hide(); + // reset the values for the title and url inputs + this.clearInputs(); + }) + .catch(this.$fhcAlert.handleSystemError); + }, + isValidationSuccessfull() { // validate the input fields if (this.title_input.length === 0) { @@ -55,33 +132,6 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, - addLink() { - // reset is-invalid css on url input field - for (let key of Object.keys(this.validation)) { - this.validation[key] = false; - } - - // early return if validation failed - if (!this.isValidationSuccessfull()) return; - - this.$fhcApi.factory.bookmark - .insert({ - tag: this.config.tag, - title: this.title_input, - url: this.url_input, - }) - .then((res) => res.data) - .then((result) => { - this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkAdded")); - // refetch the bookmarks to see the updates - this.fetchBookmarks(); - }) - .catch(this.$fhcAlert.handleSystemError); - - // reset the values for the title and url inputs - this.title_input = ""; - this.url_input = ""; - }, async removeLink(bookmark_id) { let isConfirmed = await this.$fhcAlert.confirmDelete(); @@ -111,46 +161,75 @@ export default {
+
-
`, +
+ + + + + + + + + + + + + + + + + `, }; /* diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 58e974f8a..03a1259e6 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -31604,6 +31604,26 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'bookmark', + 'phrase' => 'editLink', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Link bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Edit link', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'bookmark', @@ -31643,6 +31663,46 @@ array( 'insertvon' => 'system' ) ) + ) + ,array( + 'app' => 'core', + 'category' => 'bookmark', + 'phrase' => 'bookmarkAdded', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Link hinzugefügt', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Link added', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ) + ,array( + 'app' => 'core', + 'category' => 'bookmark', + 'phrase' => 'bookmarkUpdated', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Link geändert', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Link updated', + 'description' => '', + 'insertvon' => 'system' + ) + ) ), array( 'app' => 'core',