Commit 420a3c95 authored by Nicolas Bailliet's avatar Nicolas Bailliet
Browse files

Cross validation administration menus moved in Add ons menu [EVSCLT-802] and...

Cross validation administration menus moved in Add ons menu [EVSCLT-802] and SQL script added for 5.11.0 release

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/EVSClient/branches/EVSClient-gazelle-nbt@66585 356b4b1a-1d2b-0410-8bf1-ffa24008f01e
parent 0bf2806a
......@@ -9,7 +9,7 @@ INSERT INTO public.evsc_calling_tool (id, label, oid, tool_type, url)
INSERT INTO cmn_application_preference (id, class_name, description, preference_name, preference_value)
VALUES (nextval('cmn_application_preference_id_seq'), 'java.lang.String', 'OID of the calling tool that the MCA will use to access cross validation', 'mca_tool_oid', 'MCA');
INSERT INTO mca_zip_config (id, doc_type, validation_type, archive_name, x_validator_oid) VALUES (nextval('mca_zip_config_id_seq'), 'XDM ZIP', NULL, 'IHE_XDM.zip');
INSERT INTO mca_zip_config (id, doc_type, validation_type, archive_name, x_validator_oid) VALUES (nextval('mca_zip_config_id_seq'), 'XDM ZIP', NULL, 'IHE_XDM.zip', '2.16.840.1.113883.2.8.3.9.3.38');
INSERT INTO mca_folder_config (id, folder_name) VALUES (nextval('mca_folder_config_id_seq'), 'IHE_XDM');
......
......@@ -29,7 +29,9 @@ import net.ihe.gazelle.evs.client.common.model.EVSMenuGroup;
import net.ihe.gazelle.evs.client.common.model.EVSMenuGroupQuery;
import net.ihe.gazelle.evs.client.common.model.ReferencedStandard;
import net.ihe.gazelle.preferences.PreferenceService;
import net.ihe.gazelle.xvalidation.menu.XValidationAuthorizations;
import net.ihe.gazelle.xvalidation.menu.XValidationPages;
import org.jboss.seam.security.Identity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -125,7 +127,19 @@ public class EVSMenu {
xvalidation.add(new MenuEntry(XValidationPages.VAL_VALIDATION));
xvalidation.add(new MenuEntry(XValidationPages.VAL_LOGS));
xvalidation.add(new MenuEntry(XValidationPages.DOC_HOME));
EVSMenu.addMenu(addOnsMenu, xvalidation, "Gazelle Cross Validation", "fa fa-sitemap", Authorizations.CROSS_VALIDATION);
if (Boolean.valueOf(PreferenceService.getString("x_validation_editor"))) {
final List<Menu> xvalidationAdmin = new ArrayList<>();
xvalidationAdmin.add(new MenuEntry(XValidationPages.ADMIN_IMPORT_VALIDATORS));
xvalidationAdmin.add(new MenuEntry(XValidationPages.ADMIN_VALIDATORS));
EVSMenu.addMenu(addOnsMenu, xvalidationAdmin, "Gazelle Cross Validation Administration", "fa fa-sitemap", XValidationAuthorizations.TEST_DESIGNER);
}
addOnsMenu.add(new MenuEntry(Pages.SCHEMATRONS));
addOnsMenu.add(new MenuEntry(Pages.STATISTICS));
......@@ -140,10 +154,6 @@ public class EVSMenu {
adminItems.add(new MenuEntry(Pages.CALLING_TOOLS));
adminItems.add(new MenuEntry(Pages.MENU_CONFIG));
adminItems.add(new MenuEntry(Pages.ADMIN_TEMPLATES));
if (PreferenceService.getBoolean("x_validation_enabled")) {
adminItems.add(new MenuEntry(XValidationPages.ADMIN_IMPORT_VALIDATORS));
adminItems.add(new MenuEntry(XValidationPages.ADMIN_VALIDATORS));
}
EVSMenu.addMenu(children, adminItems, "gazelle.evs.client.admin.main.menu", "fa fa-television",
Authorizations.ADMIN);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment