diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index e22d72f5f..544e8ea97 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -6103,7 +6103,9 @@ JS // We want to avoid launching the listener twice, first here, and secondly after saving the Ticket in the listener // By disabling the event to be fired, we can remove the current object from the attribute ! $oObject = MetaModel::GetObject($sClass, $sId, false); - self::FireEventDbLinksChangedForObject($oObject); + if (!is_null($oObject)) { + self::FireEventDbLinksChangedForObject($oObject); + } self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId); } diff --git a/core/inlineimage.class.inc.php b/core/inlineimage.class.inc.php index ce49078ea..bc59cb7dd 100644 --- a/core/inlineimage.class.inc.php +++ b/core/inlineimage.class.inc.php @@ -54,7 +54,7 @@ class InlineImage extends DBObject ); MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - MetaModel::Init_AddAttribute(new AttributeDateTime("expire", array("allowed_values"=>null, "sql"=>'expire', "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array(), "always_load_in_tables"=>false))); + MetaModel::Init_AddAttribute(new AttributeDateTime("expire", array("allowed_values" => null, "sql" => 'expire', "default_value" => 'DATE_ADD(NOW(), INTERVAL 1 DAY)', "is_null_allowed" => false, "depends_on" => array(), "always_load_in_tables" => false))); MetaModel::Init_AddAttribute(new AttributeString("temp_id", array("allowed_values"=>null, "sql"=>'temp_id', "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array(), "always_load_in_tables"=>false))); MetaModel::Init_AddAttribute(new AttributeString("item_class", array("allowed_values"=>null, "sql"=>'item_class', "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array(), "always_load_in_tables"=>false))); MetaModel::Init_AddAttribute(new AttributeObjectKey("item_id", array("class_attcode"=>'item_class', "allowed_values"=>null, "sql"=>'item_id', "is_null_allowed"=>true, "depends_on"=>array(), "always_load_in_tables"=>false))); diff --git a/css/backoffice/utils/variables/colors/_base-palette.scss b/css/backoffice/utils/variables/colors/_base-palette.scss index 32621b544..fdd534581 100644 --- a/css/backoffice/utils/variables/colors/_base-palette.scss +++ b/css/backoffice/utils/variables/colors/_base-palette.scss @@ -99,6 +99,28 @@ $ibo-color-pink-800: $common-color-pink-800 !default; $ibo-color-pink-900: $common-color-pink-900 !default; $ibo-color-pink-950: $common-color-pink-950 !default; +$ibo-color-yellow-100: $common-color-yellow-100 !default; +$ibo-color-yellow-200: $common-color-yellow-200 !default; +$ibo-color-yellow-300: $common-color-yellow-300 !default; +$ibo-color-yellow-400: $common-color-yellow-400 !default; +$ibo-color-yellow-500: $common-color-yellow-500 !default; +$ibo-color-yellow-600: $common-color-yellow-600 !default; +$ibo-color-yellow-700: $common-color-yellow-700 !default; +$ibo-color-yellow-800: $common-color-yellow-800 !default; +$ibo-color-yellow-900: $common-color-yellow-900 !default; +$ibo-color-yellow-950: $common-color-yellow-950 !default; + +$ibo-color-purple-100: $common-color-purple-100 !default; +$ibo-color-purple-200: $common-color-purple-200 !default; +$ibo-color-purple-300: $common-color-purple-300 !default; +$ibo-color-purple-400: $common-color-purple-400 !default; +$ibo-color-purple-500: $common-color-purple-500 !default; +$ibo-color-purple-600: $common-color-purple-600 !default; +$ibo-color-purple-700: $common-color-purple-700 !default; +$ibo-color-purple-800: $common-color-purple-800 !default; +$ibo-color-purple-900: $common-color-purple-900 !default; +$ibo-color-purple-950: $common-color-purple-950 !default; + $ibo-colors: $common-colors; /* CSS variables */ @@ -196,4 +218,26 @@ $ibo-colors: $common-colors; --ibo-color-pink-800: #{$ibo-color-pink-800}; --ibo-color-pink-900: #{$ibo-color-pink-900}; --ibo-color-pink-950: #{$ibo-color-pink-950}; + + --ibo-color-yellow-100: #{$ibo-color-yellow-100}; + --ibo-color-yellow-200: #{$ibo-color-yellow-200}; + --ibo-color-yellow-300: #{$ibo-color-yellow-300}; + --ibo-color-yellow-400: #{$ibo-color-yellow-400}; + --ibo-color-yellow-500: #{$ibo-color-yellow-500}; + --ibo-color-yellow-600: #{$ibo-color-yellow-600}; + --ibo-color-yellow-700: #{$ibo-color-yellow-700}; + --ibo-color-yellow-800: #{$ibo-color-yellow-800}; + --ibo-color-yellow-900: #{$ibo-color-yellow-900}; + --ibo-color-yellow-950: #{$ibo-color-yellow-950}; + + --ibo-color-purple-100: #{$ibo-color-purple-100}; + --ibo-color-purple-200: #{$ibo-color-purple-200}; + --ibo-color-purple-300: #{$ibo-color-purple-300}; + --ibo-color-purple-400: #{$ibo-color-purple-400}; + --ibo-color-purple-500: #{$ibo-color-purple-500}; + --ibo-color-purple-600: #{$ibo-color-purple-600}; + --ibo-color-purple-700: #{$ibo-color-purple-700}; + --ibo-color-purple-800: #{$ibo-color-purple-800}; + --ibo-color-purple-900: #{$ibo-color-purple-900}; + --ibo-color-purple-950: #{$ibo-color-purple-950}; } \ No newline at end of file diff --git a/css/common/utils/variables/colors/_base-palette.scss b/css/common/utils/variables/colors/_base-palette.scss index 16e73d134..622994d9a 100644 --- a/css/common/utils/variables/colors/_base-palette.scss +++ b/css/common/utils/variables/colors/_base-palette.scss @@ -99,4 +99,26 @@ $common-color-pink-800: hsla(322, 60%, 37%, 1) !default; $common-color-pink-900: hsla(318, 51%, 29%, 1) !default; $common-color-pink-950: hsla(318, 51%, 21%, 1) !default; -$common-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pink', 'primary', 'secondary', 'information', 'success', 'warning', 'danger'); \ No newline at end of file +$common-color-yellow-100: hsla(60, 100%, 97.06%, 1) !default; +$common-color-yellow-200: hsla(58.1, 96.92%, 87.25%, 1) !default; +$common-color-yellow-300: hsla(54.69, 91.87%, 75.88%, 1) !default; +$common-color-yellow-400: hsla(51.32, 89.41%, 66.67%, 1) !default; +$common-color-yellow-500: hsla(46.96, 80.9%, 60.98%, 1) !default; +$common-color-yellow-600: hsla(40, 67.2%, 50.98%, 1) !default; +$common-color-yellow-700: hsla(35.53, 71.03%, 41.96%, 1) !default; +$common-color-yellow-800: hsla(31.63, 74.57%, 33.92%, 1) !default; +$common-color-yellow-900: hsla(30, 75.76%, 25.88%, 1) !default; +$common-color-yellow-950: hsla(29, 80%, 17%, 1) !default; + +$common-color-purple-100: hsla(251.43, 91.3%, 95.49%, 1) !default; +$common-color-purple-200: hsla(250.5, 95.24%, 91.76%, 1) !default; +$common-color-purple-300: hsla(252.5, 94.74%, 85.1%, 1) !default; +$common-color-purple-400: hsla(255.14, 91.74%, 76.27%, 1) !default; +$common-color-purple-500: hsla(258.31, 89.53%, 66.27%, 1) !default; +$common-color-purple-600: hsla(262.12, 83.26%, 57.84%, 1) !default; +$common-color-purple-700: hsla(263.39, 69.96%, 50.39%, 1) !default; +$common-color-purple-800: hsla(263.36, 69.3%, 42.16%, 1) !default; +$common-color-purple-900: hsla(263.5, 67.42%, 34.9%, 1) !default; +$common-color-purple-950: hsla(263, 71%, 26%, 1) !default; + +$common-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pink', 'yellow', 'purple', 'primary', 'secondary', 'information', 'success', 'warning', 'danger'); \ No newline at end of file diff --git a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml index 6940327b7..61f37faf4 100755 --- a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml +++ b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml @@ -57,7 +57,7 @@ expire - + DATE_ADD(NOW(), INTERVAL 1 DAY) false diff --git a/sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenu.php b/sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenu.php index 714509b2f..085641e88 100644 --- a/sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenu.php +++ b/sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenu.php @@ -388,8 +388,16 @@ class NavigationMenu extends UIBlock implements iKeyboardShortcut <<