[PORTAL-7] Features and repairs from 1707

This merges latest changes made to Raptor and other features.

Change-Id: I3a58f88e988ddadf52e1c0c782cdccd2b2ecf5e9
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_1610.2_to_1707_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_1610.2_to_1707_OS.sql
index 81522f82..c7d448db 100644
--- a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_1610.2_to_1707_OS.sql
+++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_1610.2_to_1707_OS.sql
@@ -1,6 +1,7 @@
 -- ---------------------------------------------------------------------------------------------------------------
 -- This script upgrades the OpenSource ECOMP SDK App database from version 1610.2 to 1707.
 -- change size on 3 name columns from fn_user for the Opensource version
+--
 -- changed DS1 icon names to DS2 icon names
 -- removed unnecessary fn_menu entries, updated fn_menu actions
 -- ---------------------------------------------------------------------------------------------------------------
@@ -39,6 +40,10 @@ update fn_menu
 set action = 'admin#/admin'
 where menu_id = 101 and label = 'Roles';
 
+update fn_menu 
+set action ='report#/report_wizard' 
+where menu_id = 87 and label = 'Create Reports';
+
 delete from fn_menu 
 where menu_id = 13 and label = 'Application Logout';
 
@@ -48,7 +53,7 @@ where menu_id = 92 and label = 'Import User';
 delete from fn_menu 
 where menu_id = 103 and label = 'Broadcast Messages';
 
-INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (89, 'Import', 8, 140, 'report_wizard.htm?action=report.import', 'menu_reports', 'Y', null, null, null, null, 'APP', 'N', null); 
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (89, 'Import', 8, 140, 'report#/report_import', 'menu_reports', 'Y', null, null, null, null, 'APP', 'N', null); 
 INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (150022, 'Menus', 10, 60, 'admin#/admin_menu_edit', 'menu_admin', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', NULL);
 
 alter table fn_user