diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php
index 143875c39..106c6058a 100644
--- a/application/controllers/components/CisVue.php
+++ b/application/controllers/components/CisVue.php
@@ -26,7 +26,8 @@ class CisVue extends Auth_Controller
public function Menu()
{
$this->load->model('content/Content_model', 'ContentModel');
- $result = $this->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, getAuthUID());
+ $menu_contentID = $this->ContentModel->getMenuContentID();
+ $result = $this->ContentModel->getMenu($menu_contentID, getAuthUID());
$menu = getData($result) ?? (object)['childs' => []];
$this->outputJsonSuccess($menu);
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index 9f0a3634e..278022b59 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -71,13 +71,23 @@ class Content_model extends DB_Model
*
* @return integer|null content_id of the Cis4_Root Menu
*/
- public function getCIS4_ContentID(){
+ public function getMenuContentID(){
+ // early return if the CIS4_MENU_ENTRY constant is defined
+ if(defined('CIS4_MENU_ENTRY'))
+ {
+ return CIS4_MENU_ENTRY;
+ }
+
+ // load the CIS4 Menu content_id from the database using the column 'beschreibugn' of the campus.tbl_content table
$CIS4_ROOT_CONTENT = $this->loadWhere(["beschreibung"=>"CIS4_ROOT"]);
+
if(isError($CIS4_ROOT_CONTENT))
{
return null;
}
+
$CIS4_ROOT_CONTENT = getData($CIS4_ROOT_CONTENT);
+
if(count($CIS4_ROOT_CONTENT) > 0)
{
return current($CIS4_ROOT_CONTENT)->content_id ?? null;
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index c9385d478..855d10b37 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -19,7 +19,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
if (!isset($menu)) {
$ci =& get_instance(); // get CI instance
$ci->load->model('content/Content_model', 'ContentModel');
- $cis4_content_id = $ci->ContentModel->getCIS4_ContentID();
+ $cis4_content_id = $ci->ContentModel->getMenuContentID();
$result = $ci->ContentModel->getMenu($cis4_content_id, getAuthUID());
$menu = getData($result)->childs ?? [];
}
diff --git a/public/css/components/MyLv.css b/public/css/components/MyLv.css
index eea5a5eea..2ce544582 100644
--- a/public/css/components/MyLv.css
+++ b/public/css/components/MyLv.css
@@ -2,7 +2,3 @@
color: #565e647f !important;
cursor: default;
}
-
-.mylv_dropdown{
- margin-left: -5px !important;
-}
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 4c17b1a1f..cf8b3fed6 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -123,18 +123,18 @@ export default {
- -
-
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index b87ef4235..8dabf7b4c 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -5,6 +5,7 @@ export default {
data: () => ({
title_input: "",
url_input: "",
+ invalidURL: false,
}),
mixins: [AbstractWidget],
computed: {
@@ -35,6 +36,15 @@ export default {
if ((await this.$fhcAlert.confirmDelete()) === false) return;
},
addLink() {
+ // reset is-invalid css on url input field
+ this.invalidURL = false;
+
+ if(!URL.canParse(this.url_input))
+ {
+ this.$fhcAlert.alertError(this.$p.t("bookmark", "invalidUrl"));
+ this.invalidURL = true;
+ return;
+ }
this.$fhcApi.factory.bookmark
.insert({
tag: this.config.tag,
@@ -83,7 +93,10 @@ export default {
{{$p.t('bookmark','newLink')}}
diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index 990f6828c..caa337aea 100644
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -410,16 +410,6 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
10487, NOW(), null, null, null, 8
);
- INSERT INTO campus.tbl_contentchild
- (content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
- VALUES
- (
- -- queries the content_id for the CIS4_ROOT
- (SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
- -- 10568 is the content_id for Zahlungen
- 10568, NOW(), null, null, null, 9
- );
-
###### Mein Studium childs
INSERT INTO campus.tbl_contentchild
@@ -465,6 +455,16 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
(SELECT content_id from campus.tbl_content WHERE beschreibung = 'BESTÄTIGUNGEN_ZEUGNISSE'),
NOW(), null, null, null, 4
);
+
+ INSERT INTO campus.tbl_contentchild
+ (content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+ VALUES
+ (
+ -- queries the content_id for the MEIN_STUDIUM
+ (SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
+ -- 10568 is the content_id for Zahlungen
+ 10568, NOW(), null, null, null, 5
+ );
INSERT INTO campus.tbl_contentchild
(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -473,7 +473,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
-- queries the content_id for the MEIN_STUDIUM
(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
-- 10795 is the content_id for Studierendenstatus
- 10795, NOW(), null, null, null, 5
+ 10795, NOW(), null, null, null, 6
);
###### VPN_STUDIERENDE childs
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8ddc16bfa..d90cd362a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31504,6 +31504,26 @@ array(
)
)
),
+ array(
+ 'app' => 'core',
+ 'category' => 'bookmark',
+ 'phrase' => 'invalidUrl',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Ungültiger Link',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Invalid link',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
array(
'app' => 'core',
'category' => 'global',