From b1c9c29f37952ce49a1cd7e970b826669d2b34fb Mon Sep 17 00:00:00 2001 From: Shamal Faily Date: Sat, 18 Nov 2017 09:49:03 -0800 Subject: [PATCH] Fix #144 --- cairis/web/dist/js/cairis/Cairis.js | 108 +++++++++++++++++- .../dist/js/cairis/architecturalpatterns.js | 7 +- .../web/dist/js/cairis/assetassociations.js | 13 +-- cairis/web/dist/js/cairis/assets.js | 5 +- cairis/web/dist/js/cairis/attackers.js | 46 +------- .../web/dist/js/cairis/conceptreferences.js | 9 +- cairis/web/dist/js/cairis/countermeasures.js | 11 +- cairis/web/dist/js/cairis/dataflows.js | 18 +-- cairis/web/dist/js/cairis/dependencies.js | 25 ++-- .../web/dist/js/cairis/documentreferences.js | 8 +- cairis/web/dist/js/cairis/domainproperties.js | 52 ++++----- cairis/web/dist/js/cairis/environments.js | 7 +- .../web/dist/js/cairis/externaldocuments.js | 8 +- cairis/web/dist/js/cairis/goals.js | 52 ++++----- cairis/web/dist/js/cairis/locations.js | 8 +- cairis/web/dist/js/cairis/obstacles.js | 6 +- .../dist/js/cairis/personacharacteristics.js | 7 +- cairis/web/dist/js/cairis/personas.js | 8 +- cairis/web/dist/js/cairis/projectSettings.js | 7 +- cairis/web/dist/js/cairis/responses.js | 26 +++-- cairis/web/dist/js/cairis/risks.js | 8 +- cairis/web/dist/js/cairis/roles.js | 8 +- cairis/web/dist/js/cairis/securitypatterns.js | 9 +- .../web/dist/js/cairis/taskcharacteristics.js | 7 +- cairis/web/dist/js/cairis/tasks.js | 7 +- cairis/web/dist/js/cairis/templateassets.js | 5 +- cairis/web/dist/js/cairis/templategoals.js | 6 +- .../dist/js/cairis/templaterequirements.js | 5 +- cairis/web/dist/js/cairis/threats.js | 8 +- cairis/web/dist/js/cairis/trustboundaries.js | 9 +- cairis/web/dist/js/cairis/usecases.js | 8 +- cairis/web/dist/js/cairis/valuetypes.js | 15 ++- cairis/web/dist/js/cairis/vulnerabilities.js | 10 +- .../editArchitecturalPatternOptions.html | 2 +- .../fastTemplates/editAttackerOptions.html | 2 +- .../fastTemplates/editEnvironmentOptions.html | 2 + .../web/fastTemplates/editGenDocOptions.html | 5 +- .../fastTemplates/editLocationsOptions.html | 8 +- .../editPersonaCharacteristicOptions.html | 2 +- .../fastTemplates/editPersonasOptions.html | 2 +- .../fastTemplates/editProjectSettings.html | 2 +- .../web/fastTemplates/editSearchOptions.html | 2 +- .../editSecurityPatternOptions.html | 2 +- .../editTaskCharacteristicOptions.html | 2 +- .../fastTemplates/editValueTypeOptions.html | 2 +- 45 files changed, 274 insertions(+), 295 deletions(-) diff --git a/cairis/web/dist/js/cairis/Cairis.js b/cairis/web/dist/js/cairis/Cairis.js index cd1ed631d..ed55822b6 100644 --- a/cairis/web/dist/js/cairis/Cairis.js +++ b/cairis/web/dist/js/cairis/Cairis.js @@ -1716,7 +1716,6 @@ $("#traceExplorer").on('click', '#AddTrace',function(e) { output.object = tr; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", @@ -1994,3 +1993,110 @@ function makeSession() { }); } +$(document).on('submit',function(e) { + if (!e.isDefaultPrevented()) { + e.preventDefault(); + var originForm = $(e.target).attr('id'); + switch (originForm) { + case "editArchitecturalPatternOptionsForm": + commitArchitecturalPattern(); + break; + case "editAssetsOptionsform": + commitAsset(); + break; + case "editAssetAssociationOptionsForm": + commitAssetAssociation(); + break; + case "editAttackerOptionsForm": + commitAttacker(); + break; + case "editConceptReferenceOptionsForm": + commitConceptReference(); + break; + case "editCountermeasureOptionsForm": + commitCountermeasure(); + break; + case "editDataflowOptionsForm": + commitDataFlow(); + break; + case "editDependencyOptionsForm": + commitDependency(); + break; + case "editDocumentReferenceOptionsForm": + commitDocumentReference(); + break; + case "editDomainPropertyOptionsForm": + commitDomainProperty(); + break; + case "editEnvironmentOptionsform": + commitEnvironment(); + break; + case "editExternalDocumentOptionsForm": + commitExternalDocument(); + break; + case "editGoalOptionsForm": + commitGoal(); + break; + case "editLocationsOptionsForm": + commitLocations(); + break; + case "editObstacleOptionsForm": + commitObstacle(); + break; + case "editPersonaCharacteristicOptionsForm": + commitPersonaCharacteristic(); + break; + case "editPersonasOptionsForm": + commitPersona(); + break; + case "ProjectsProperties": + commitProject(); + break; + case "editResponseOptionsform": + commitResponse(); + break; + case "editRisksForm": + commitRisk(); + break; + case "editRoleOptionsform": + commitRole(); + break; + case "editScoredValueTypeOptionsForm": + commitValueType(); + break; + case "editSecurityPatternOptionsForm": + commitSecurityPattern(); + break; + case "editTaskCharacteristicOptionsForm": + commitTaskCharacteristic(); + break; + case "editTaskOptionsForm" : + commitTask(); + break; + case "editTemplateAssetOptionsform": + commitTemplateAsset(); + break; + case "editTemplateGoalOptionsForm": + commitTemplateGoal(); + break; + case "editTemplateRequirementOptionsForm": + commitTemplateRequirement(); + break; + case "editThreatOptionsform": + commitThreat(); + break; + case "editTrustBoundaryOptionsForm": + commitTrustBoundary(); + break; + case "editUseCaseOptionsForm": + commitUseCase(); + break; + case "editValueTypeOptionsForm": + commitValueType(); + break; + case "editVulnerabilityOptionsform": + commitVulnerability(); + break; + } + } +}); diff --git a/cairis/web/dist/js/cairis/architecturalpatterns.js b/cairis/web/dist/js/cairis/architecturalpatterns.js index a7d220a31..ae04a85de 100644 --- a/cairis/web/dist/js/cairis/architecturalpatterns.js +++ b/cairis/web/dist/js/cairis/architecturalpatterns.js @@ -241,9 +241,7 @@ $(document).on("click", "#addNewArchitecturalPattern", function () { }); }); -var mainContent = $("#objectViewer"); -mainContent.on("click","#UpdateArchitecturalPattern",function(e) { - e.preventDefault(); +function commitArchitecturalPattern() { var ap = JSON.parse($.session.get("ArchitecturalPattern")); if ($("#editArchitecturalPatternOptionsForm").hasClass("new")) { ap.theName = $('#theName').val(); @@ -263,7 +261,7 @@ mainContent.on("click","#UpdateArchitecturalPattern",function(e) { refreshMenuBreadCrumb('architectural_pattern'); }); } -}); +} function postArchitecturalPattern(ap, callback){ var output = {}; @@ -402,6 +400,7 @@ $(document).on('click', "td.component-row", function () { }); }); +var mainContent = $("#objectViewer"); mainContent.on('click','#addComponent',function() { $.session.set("Component", JSON.stringify(jQuery.extend(true, {},componentDefault ))); $("#editComponentDiv").addClass('new'); diff --git a/cairis/web/dist/js/cairis/assetassociations.js b/cairis/web/dist/js/cairis/assetassociations.js index 950a608ea..850db5fe5 100644 --- a/cairis/web/dist/js/cairis/assetassociations.js +++ b/cairis/web/dist/js/cairis/assetassociations.js @@ -124,7 +124,6 @@ $(document).on('click', "td.assetassociation-rows", function(){ var assoc = assocs[$(this).closest('tr').index()]; fillOptionMenu("fastTemplates/editAssetAssociationOptions.html","#objectViewer",null,true,true, function(){ - $('#editAssetAssociationOptionsForm').validator(); $('#UpdateAssetAssociation').text("Update"); refreshDimensionSelector($('#theEnvironmentName'),'environment',undefined,function() { $('#theEnvironmentName').val(assoc.theEnvironmentName); @@ -143,17 +142,14 @@ $(document).on('click', "td.assetassociation-rows", function(){ $('#theRationale').val(assoc.theRationale); $.session.set("AssetAssociation", JSON.stringify(assoc)); $('#editAssetAssociationOptionsForm').loadJSON(assoc, null); + $('#editAssetAssociationOptionsForm').validator('update'); },['All']); },['All']); },['All']); }); }); -var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdateAssetAssociation', function (e) { - e.preventDefault(); - $("#editAssetAssociationOptionsForm").validator(); - +function commitAssetAssociation() { var assoc = JSON.parse($.session.get("AssetAssociation")); var oldEnvName = assoc.theEnvironmentName; var oldHeadName = assoc.theHeadAsset; @@ -184,8 +180,9 @@ mainContent.on('click', '#UpdateAssetAssociation', function (e) { refreshMenuBreadCrumb('assetassociation'); }); } -}); +} +var mainContent = $("#objectViewer"); mainContent.on('change',"#theEnvironmentName", function() { var envName = $(this).find('option:selected').text(); var currentHeadAsset = $('#theHeadAsset').val(); @@ -276,7 +273,6 @@ function putAssetAssociation(assoc, oldEnvName, oldHeadAsset, oldTailAsset, call output.object = assoc; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -308,7 +304,6 @@ function postAssetAssociation(assoc, callback){ output.object = assoc; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/assets.js b/cairis/web/dist/js/cairis/assets.js index a62f9608b..37e0282b8 100644 --- a/cairis/web/dist/js/cairis/assets.js +++ b/cairis/web/dist/js/cairis/assets.js @@ -632,8 +632,7 @@ mainContent.on('click', '#cancelButtonAsset', function(){ }); -mainContent.on('click', '#UpdateAsset',function(e){ - e.preventDefault(); +function commitAsset(){ var envProps = $.session.get("AssetProperties"); if (envProps == undefined || envProps.length == 0) { alert("Environments not defined"); @@ -648,7 +647,7 @@ mainContent.on('click', '#UpdateAsset',function(e){ $('#menuBCClick').attr('dimension','asset'); refreshMenuBreadCrumb('asset'); } -}); +} mainContent.on('click', '#CloseAsset', function (e) { e.preventDefault(); diff --git a/cairis/web/dist/js/cairis/attackers.js b/cairis/web/dist/js/cairis/attackers.js index 43496ec99..5d5b815d6 100644 --- a/cairis/web/dist/js/cairis/attackers.js +++ b/cairis/web/dist/js/cairis/attackers.js @@ -382,8 +382,7 @@ function addRoleToAttacker() { }); } -mainContent.on('click', '#UpdateAttacker', function (e) { - e.preventDefault(); +function commitAttacker() { $("#editAttackerOptionsForm").validator('validate'); var attacker = JSON.parse($.session.get("Attacker")); if (attacker.theEnvironmentProperties.length == 0) { @@ -411,7 +410,7 @@ mainContent.on('click', '#UpdateAttacker', function (e) { }); } } -}); +} $(document).on("click", "#addNewAttacker", function () { refreshObjectBreadCrumb('New Attacker'); @@ -425,42 +424,6 @@ $(document).on("click", "#addNewAttacker", function () { }); }); -/* -mainContent.on('click', "#UpdateAttackerCapability", function () { - var attacker = JSON.parse($.session.get("Attacker")); - var theEnvName = $.session.get("attackerEnvironmentName"); - if($("#addAttackerPropertyDiv").hasClass("new")){ - $.each(attacker.theEnvironmentProperties, function (index, env) { - if(env.theEnvironmentName == theEnvName){ - var prop = {}; - prop.name = $("#theCap option:selected").text(); - prop.value = $("#thePropValue option:selected").text(); - env.theCapabilities.push(prop); - $.session.set("Attacker", JSON.stringify(attacker)); - appendAttackerCapability(prop); - attackerToggle(); - } - }); - } - else { - var oldCapName = $.session.get("AttackerCapName"); - $.each(attacker.theEnvironmentProperties, function (index, env) { - if(env.theEnvironmentName == theEnvName){ - $.each(env.theCapabilities, function (index, cap) { - if(oldCapName == cap.name){ - cap.name = $("#theCap option:selected").text(); - cap.value = $("#thePropValue option:selected").text(); - } - }); - $.session.set("Attacker", JSON.stringify(attacker)); - $("#theAttackerEnvironments").find(".attackerEnvironment:first").trigger('click'); - attackerToggle(); - } - }); - } -}); -*/ - mainContent.on("click", ".removeAttackerCapability", function () { var text = $(this).closest('tr').find(".attackerCapability").text(); $(this).closest("tr").remove(); @@ -507,9 +470,6 @@ $(document).on('click', 'td.deleteAttackerButton', function (e) { }); }); - - - var uploading = false; $("#objectViewer").on('click', '#theAttackerImage', function () { if(!uploading) { @@ -598,7 +558,6 @@ function putAttacker(attacker, oldName, callback){ output.object = attacker; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -630,7 +589,6 @@ function postAttacker(attacker, callback){ output.object = attacker; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/conceptreferences.js b/cairis/web/dist/js/cairis/conceptreferences.js index a5f84d608..cb8b755fc 100644 --- a/cairis/web/dist/js/cairis/conceptreferences.js +++ b/cairis/web/dist/js/cairis/conceptreferences.js @@ -115,14 +115,13 @@ $(document).on('click', "td.conceptreference-rows", function () { }); }); +var mainContent = $("#objectViewer"); mainContent.on('change', '#theDimName', function (e) { e.preventDefault(); getObjtNames($('#theDimName').val()); }); -var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdateConceptReference', function (e) { - e.preventDefault(); +function commitConceptReference() { var cr = JSON.parse($.session.get("ConceptReference")); var oldName = cr.theName; cr.theName = $("#theName").val(); @@ -141,7 +140,7 @@ mainContent.on('click', '#UpdateConceptReference', function (e) { createConceptReferencesTable(); }); } -}); +} $(document).on('click', 'td.deleteConceptReferenceButton', function (e) { e.preventDefault(); @@ -168,7 +167,6 @@ function putConceptReference(cr, oldName, callback){ output.object = cr; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -200,7 +198,6 @@ function postConceptReference(cr, callback){ output.object = cr; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/countermeasures.js b/cairis/web/dist/js/cairis/countermeasures.js index fd2b02bf8..05570fc3c 100644 --- a/cairis/web/dist/js/cairis/countermeasures.js +++ b/cairis/web/dist/js/cairis/countermeasures.js @@ -628,8 +628,7 @@ function addCountermeasureEnvironment() { }); }; -mainContent.on('click', '#UpdateCountermeasure', function (e) { - e.preventDefault(); +function commitCountermeasure() { var cm = JSON.parse($.session.get("Countermeasure")); if (cm.theEnvironmentProperties.length == 0) { alert("Environments not defined"); @@ -657,7 +656,7 @@ mainContent.on('click', '#UpdateCountermeasure', function (e) { }); } } -}); +} mainContent.on('click', ".deleteCountermeasureEnv", function () { var envi = $(this).next(".countermeasuresEnvironments").text(); @@ -820,7 +819,6 @@ function postCountermeasure(countermeasure, callback){ output.object = countermeasure; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", @@ -952,7 +950,6 @@ function generateAsset(cmName) { var output = {}; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", @@ -984,7 +981,6 @@ function generateAssetFromTemplate() { var output = {}; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", @@ -1014,7 +1010,6 @@ function situateCountermeasurePattern() { var output = {}; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", @@ -1045,7 +1040,6 @@ function associateWithSituatedPattern() { var output = {}; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", @@ -1076,7 +1070,6 @@ function removeCountermeasurePattern() { var output = {}; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "DELETE", diff --git a/cairis/web/dist/js/cairis/dataflows.js b/cairis/web/dist/js/cairis/dataflows.js index f270295db..b93240bda 100644 --- a/cairis/web/dist/js/cairis/dataflows.js +++ b/cairis/web/dist/js/cairis/dataflows.js @@ -104,7 +104,6 @@ $(document).on('click', "td.dataflow-rows", function(){ $.session.set("Dataflow", JSON.stringify(dataflow)); fillOptionMenu("fastTemplates/editDataflowOptions.html","#objectViewer",null,true,true, function(){ - $('#editDataflowOptionsForm').validator(); $('#UpdateDataflow').text("Update"); refreshDimensionSelector($('#theDataflowEnvironmentName'),'environment',undefined,function() { $('#theDataflowEnvironmentName').val(dataflow.theEnvironmentName); @@ -116,6 +115,7 @@ $(document).on('click', "td.dataflow-rows", function(){ $.each(dataflow.theAssets,function(idx,dfAsset) { appendDataflowAsset(dfAsset); }); + $('#editDataflowOptionsForm').validator('update'); },['All']); },['All']); }); @@ -127,13 +127,7 @@ function appendDataflowAsset(dfAsset) { $("#theDataflowAssets").find("tbody").append("" + dfAsset + "").animate('slow'); } -var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdateDataflow', function (e) { - - e.preventDefault(); - $("#editDataflowOptionsForm").validator(); - - +function commitDataFlow() { var dataflow = JSON.parse($.session.get("Dataflow")); var oldDfName = dataflow.theName; var oldEnvName = dataflow.theEnvironmentName; @@ -157,8 +151,9 @@ mainContent.on('click', '#UpdateDataflow', function (e) { refreshMenuBreadCrumb('dataflow'); }); } -}); +} +var mainContent = $("#objectViewer"); mainContent.on('change',"#theDataflowEnvironmentName", function() { var envName = $(this).find('option:selected').text(); var currentFromName = $('#theDataflowFromName').val(); @@ -215,7 +210,8 @@ $(document).on("click", "#addNewDataflow", function () { $(document).on('click', 'td.deleteDataflowButton', function (e) { e.preventDefault(); var dataflows = JSON.parse($.session.get("Dataflows")); - var dataflow = dataflows[$(this).index()]; + var dfRow = $(this).closest('tr'); + var dataflow = dataflows[dfRow.index()]; deleteDataflow(dataflow, function () { $('#menuBCClick').attr('dimension','dataflow'); refreshMenuBreadCrumb('dataflow'); @@ -263,7 +259,6 @@ function putDataflow(dataflow, oldDfName, oldEnvName, callback){ output.object = dataflow; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -295,7 +290,6 @@ function postDataflow(dataflow, callback){ output.object = dataflow; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/dependencies.js b/cairis/web/dist/js/cairis/dependencies.js index 7574a47d4..8a4c3ad83 100644 --- a/cairis/web/dist/js/cairis/dependencies.js +++ b/cairis/web/dist/js/cairis/dependencies.js @@ -19,12 +19,6 @@ 'use strict'; -$('#editDependencyOptionsForm').validator().on('submit', function (e) { - if (e.isDefaultPrevented()) { - alert("Def prevented"); - } -}); - $("#dependenciesClick").click(function(){ validateClick('dependency',function() { $('#menuBCClick').attr('dimension','dependency'); @@ -120,19 +114,15 @@ $(document).on('click', "td.dependency-rows", function(){ $('#theRationale').val(dependency.theRationale); $.session.set("Dependency", JSON.stringify(dependency)); $('#editDependencyOptionsForm').loadJSON(dependency, null); + $('#editDependencyOptionsForm').validator('update'); },['All']); - }); - }); - }); + },['All']); + },['All']); + },['All']); }); }); -var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdateDependency', function (e) { - - e.preventDefault(); - $("#editDependencyOptionsForm").validator(); - +function commitDependency() { var dependency = JSON.parse($.session.get("Dependency")); var oldEnvName = dependency.theEnvironmentName; var oldDepender = dependency.theDepender; @@ -158,8 +148,9 @@ mainContent.on('click', '#UpdateDependency', function (e) { refreshMenuBreadCrumb('dependency'); }); } -}); +} +var mainContent = $("#objectViewer"); mainContent.on('change',"#theEnvironmentName", function() { var envName = $(this).find('option:selected').text(); var currentDepender = $('#theDependerName').val(); @@ -251,7 +242,6 @@ function putDependency(dependency, oldEnvName, oldDepender, oldDependee, oldDepe output.object = dependency; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -283,7 +273,6 @@ function postDependency(dependency, callback){ output.object = dependency; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/documentreferences.js b/cairis/web/dist/js/cairis/documentreferences.js index e7570bb14..c7aa6d38c 100644 --- a/cairis/web/dist/js/cairis/documentreferences.js +++ b/cairis/web/dist/js/cairis/documentreferences.js @@ -122,8 +122,8 @@ $(document).on('click', "td.documentreference-rows", function () { }); var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdateDocumentReference', function (e) { - e.preventDefault(); + +function commitDocumentReference() { var dr = JSON.parse($.session.get("DocumentReference")); var oldName = dr.theName; dr.theName = $("#theName").val(); @@ -144,7 +144,7 @@ mainContent.on('click', '#UpdateDocumentReference', function (e) { refreshMenuBreadCrumb('document_reference'); }); } -}); +} $(document).on('click', 'td.deleteDocumentReferenceButton', function (e) { e.preventDefault(); @@ -177,7 +177,6 @@ function putDocumentReference(dr, oldName, callback){ output.object = dr; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -209,7 +208,6 @@ function postDocumentReference(dr, callback){ output.object = dr; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/domainproperties.js b/cairis/web/dist/js/cairis/domainproperties.js index 366f9efc6..50edf8d6b 100644 --- a/cairis/web/dist/js/cairis/domainproperties.js +++ b/cairis/web/dist/js/cairis/domainproperties.js @@ -136,32 +136,30 @@ function viewDomainProperty(dpName) { var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdateDomainProperty', function (e) { - e.preventDefault(); - var dp = JSON.parse($.session.get("DomainProperty")); - var oldName = dp.theName; - dp.theName = $("#theName").val(); - dp.theType = $("#theType").val(); - dp.theDescription = $("#theDescription").val(); - var tags = $("#theTags").text().split(", "); - if(tags[0] != ""){ - dp.theTags = tags; - } - - if($("#editDomainPropertyOptionsForm").hasClass("new")){ - postDomainProperty(dp, function () { - $("#editDomainPropertyOptionsForm").removeClass("new") - $('#menuBCClick').attr('dimension','domain_property'); - refreshMenuBreadCrumb('domain_property'); - }); - } - else { - putDomainProperty(dp, oldName, function () { - $('#menuBCClick').attr('dimension','domain_property'); - refreshMenuBreadCrumb('domain_property'); - }); - } -}); +function commitDomainProperty() { + var dp = JSON.parse($.session.get("DomainProperty")); + var oldName = dp.theName; + dp.theName = $("#theName").val(); + dp.theType = $("#theType").val(); + dp.theDescription = $("#theDescription").val(); + var tags = $("#theTags").text().split(", "); + if(tags[0] != ""){ + dp.theTags = tags; + } + if($("#editDomainPropertyOptionsForm").hasClass("new")){ + postDomainProperty(dp, function () { + $("#editDomainPropertyOptionsForm").removeClass("new") + $('#menuBCClick').attr('dimension','domain_property'); + refreshMenuBreadCrumb('domain_property'); + }); + } + else { + putDomainProperty(dp, oldName, function () { + $('#menuBCClick').attr('dimension','domain_property'); + refreshMenuBreadCrumb('domain_property'); + }); + } +} $(document).on('click', 'td.deleteDomainPropertyButton', function (e) { e.preventDefault(); @@ -211,7 +209,6 @@ function putDomainProperty(dp, oldName, callback){ output.object = dp; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -243,7 +240,6 @@ function postDomainProperty(dp, callback){ output.object = dp; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/environments.js b/cairis/web/dist/js/cairis/environments.js index 91b464799..6e1d46a9c 100644 --- a/cairis/web/dist/js/cairis/environments.js +++ b/cairis/web/dist/js/cairis/environments.js @@ -177,9 +177,7 @@ function addEnvToEnv() { }; -$(document).on('submit',function(e) { - if (!e.isDefaultPrevented()) { - e.preventDefault(); +function commitEnvironment() { var env = JSON.parse($.session.get("Environment")); var oldName = env.theName; env = fillupEnvironmentObject(env); @@ -197,8 +195,7 @@ $(document).on('submit',function(e) { refreshMenuBreadCrumb('environment'); }); } - } -}); +} $("#mainTable").on("click", "#addNewEnvironment", function () { diff --git a/cairis/web/dist/js/cairis/externaldocuments.js b/cairis/web/dist/js/cairis/externaldocuments.js index e34700104..6e21c9b36 100644 --- a/cairis/web/dist/js/cairis/externaldocuments.js +++ b/cairis/web/dist/js/cairis/externaldocuments.js @@ -110,8 +110,8 @@ $(document).on('click', "td.externaldocument-rows", function () { }); var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdateExternalDocument', function (e) { - e.preventDefault(); + +function commitExternalDocument() { var edoc = JSON.parse($.session.get("ExternalDocument")); var oldName = edoc.theName; edoc.theName = $("#theName").val(); @@ -133,7 +133,7 @@ mainContent.on('click', '#UpdateExternalDocument', function (e) { refreshMenuBreadCrumb('external_document'); }); } -}); +} $(document).on('click', 'td.deleteExternalDocumentButton', function (e) { e.preventDefault(); @@ -160,7 +160,6 @@ function putExternalDocument(edoc, oldName, callback){ output.object = edoc; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -192,7 +191,6 @@ function postExternalDocument(edoc, callback){ output.object = edoc; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/goals.js b/cairis/web/dist/js/cairis/goals.js index 1a4222505..b6f661cbe 100644 --- a/cairis/web/dist/js/cairis/goals.js +++ b/cairis/web/dist/js/cairis/goals.js @@ -430,35 +430,34 @@ $(document).on('click', '#addNewGoal', function () { }); -mainContent.on('click', "#updateGoalButton", function (e) { - e.preventDefault(); - var goal = JSON.parse($.session.get("Goal")); - if (goal.theEnvironmentProperties.length == 0) { - alert("Environments not defined"); - } - else { - var oldName = goal.theName; - goal.theName = $("#theName").val(); - goal.theOriginator = $("#theOriginator").val(); - var tags = $("#theTags").text().split(", "); - if(tags[0] != ""){ - goal.theTags = tags; +function commitGoal() { + var goal = JSON.parse($.session.get("Goal")); + if (goal.theEnvironmentProperties.length == 0) { + alert("Environments not defined"); } - if($("#editGoalOptionsForm").hasClass("new")){ - postGoal(goal, function () { - $("#editGoalOptionsForm").removeClass("new") - $('#menuBCClick').attr('dimension','goal'); - refreshMenuBreadCrumb('goal'); - }); - } else { - putGoal(goal, oldName, function () { - $('#menuBCClick').attr('dimension','goal'); - refreshMenuBreadCrumb('goal'); - }); + var oldName = goal.theName; + goal.theName = $("#theName").val(); + goal.theOriginator = $("#theOriginator").val(); + var tags = $("#theTags").text().split(", "); + if(tags[0] != ""){ + goal.theTags = tags; + } + if($("#editGoalOptionsForm").hasClass("new")){ + postGoal(goal, function () { + $("#editGoalOptionsForm").removeClass("new") + $('#menuBCClick').attr('dimension','goal'); + refreshMenuBreadCrumb('goal'); + }); + } + else { + putGoal(goal, oldName, function () { + $('#menuBCClick').attr('dimension','goal'); + refreshMenuBreadCrumb('goal'); + }); + } } - } -}); +} mainContent.on('click', '.editGoalSubGoalRow', function () { toggleGoalWindow("#editgoalSubGoal"); @@ -749,7 +748,6 @@ function postGoal(goal, callback){ output.object = goal; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/locations.js b/cairis/web/dist/js/cairis/locations.js index 6a60d5b8c..4cbf4f407 100644 --- a/cairis/web/dist/js/cairis/locations.js +++ b/cairis/web/dist/js/cairis/locations.js @@ -107,6 +107,7 @@ function viewLocations(locsName) { $.each(data.theLocations,function(idx,loc) { appendLocation(loc); }); + $("#editLocationsOptionsForm").validator('update'); }); }, error: function (xhr, textStatus, errorThrown) { @@ -467,8 +468,7 @@ mainContent.on('click','td.deleteLocationLink',function() { }); -mainContent.on('click', '#UpdateLocations', function (e) { - e.preventDefault(); +function commitLocations() { var locs = JSON.parse($.session.get("Locations")); var oldName = locs.theName; locs.theName = $("#theLocationsName").val(); @@ -486,7 +486,7 @@ mainContent.on('click', '#UpdateLocations', function (e) { refreshMenuBreadCrumb('location'); }); } -}); +} $(document).on('click', 'td.deleteLocationsButton', function (e) { e.preventDefault(); @@ -514,7 +514,6 @@ function putLocations(locs, oldName, callback){ output.object = locs; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -546,7 +545,6 @@ function postLocations(locs, callback){ output.object = locs; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/obstacles.js b/cairis/web/dist/js/cairis/obstacles.js index 755b1fc5b..5fd1c9eb7 100644 --- a/cairis/web/dist/js/cairis/obstacles.js +++ b/cairis/web/dist/js/cairis/obstacles.js @@ -424,8 +424,7 @@ $(document).on('click', '#addNewObstacle', function () { }); -mainContent.on('click', "#updateObstacleButton", function (e) { - e.preventDefault(); +function commitObstacle() { var obstacle = JSON.parse($.session.get("Obstacle")); if (obstacle.theEnvironmentProperties.length == 0) { alert("Environments not defined"); @@ -452,7 +451,7 @@ mainContent.on('click', "#updateObstacleButton", function (e) { }); } } -}); +} mainContent.on('click', '.obstacle_editGoalSubGoalRow', function () { var refRow = $(this).closest('tr'); @@ -647,7 +646,6 @@ function postObstacle(obstacle, callback){ output.object = obstacle; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/personacharacteristics.js b/cairis/web/dist/js/cairis/personacharacteristics.js index 755a4c9bd..92474dba5 100644 --- a/cairis/web/dist/js/cairis/personacharacteristics.js +++ b/cairis/web/dist/js/cairis/personacharacteristics.js @@ -164,8 +164,7 @@ $(document).on('click', "td.personacharacteristic-rows", function () { }); var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdatePersonaCharacteristic', function (e) { - e.preventDefault(); +function commitPersonaCharacteristic() { var pc = JSON.parse($.session.get("PersonaCharacteristic")); var oldName = pc.theCharacteristic; pc.thePersonaName = $("#thePersonaName").val(); @@ -188,7 +187,7 @@ mainContent.on('click', '#UpdatePersonaCharacteristic', function (e) { refreshMenuBreadCrumb('persona_characteristic'); }); } -}); +} $(document).on('click', 'td.deletePersonaCharacteristicButton', function (e) { e.preventDefault(); @@ -238,7 +237,6 @@ function putPersonaCharacteristic(pc, oldName, callback){ output.object = pc; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -270,7 +268,6 @@ function postPersonaCharacteristic(pc, callback){ output.object = pc; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/personas.js b/cairis/web/dist/js/cairis/personas.js index ad6c30cc1..c7c766347 100644 --- a/cairis/web/dist/js/cairis/personas.js +++ b/cairis/web/dist/js/cairis/personas.js @@ -280,9 +280,7 @@ function addRoleToPersona(){ }); }; -mainContent.on('click', '#UpdatePersona', function (e) { - $("#editPersonasOptionsForm").validator('validate'); - e.preventDefault(); +function commitPersona() { var persona = JSON.parse($.session.get("Persona")); if (persona.theEnvironmentProperties.length == 0) { alert("Environments not defined"); @@ -329,7 +327,7 @@ mainContent.on('click', '#UpdatePersona', function (e) { }); } } -}); +} $(document).on("click", "#addNewPersona", function () { refreshObjectBreadCrumb('New Persona'); @@ -465,7 +463,6 @@ function putPersona(persona, oldName, callback){ output.object = persona; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -497,7 +494,6 @@ function postPersona(persona, callback){ output.object = persona; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/projectSettings.js b/cairis/web/dist/js/cairis/projectSettings.js index c2d9ebb0b..540c4b112 100644 --- a/cairis/web/dist/js/cairis/projectSettings.js +++ b/cairis/web/dist/js/cairis/projectSettings.js @@ -22,7 +22,6 @@ $("#projectClick").click(function () { $('#menuBCClick').attr('dimension','properties'); refreshMenuBreadCrumb('properties'); -// showProjectSettingsForm(); }); function showProjectSettingsForm() { @@ -48,6 +47,7 @@ function showProjectSettingsForm() { currentRevision += 1; }); $.session.set("ProjectRevision", currentRevision); + $('#ProjectsProperties').validator('update'); }); }); }; @@ -163,8 +163,7 @@ mainContent.on('click', '.editNamingConvention', function () { $("#conventionDefinition").val(val); }); -mainContent.on("click", "#updateProjectButton", function (e) { - e.preventDefault(); +function commitProject() { var settings = JSON.parse($.session.get("ProjectSettings")); settings.projectName = $("#projectName").val(); settings.projectBackground = $("#projectBackground").val(); @@ -174,7 +173,7 @@ mainContent.on("click", "#updateProjectButton", function (e) { forceCloseOptions(); $.session.set("ProjectSettings", JSON.stringify(settings)); refreshHomeBreadCrumb(); -}); +} mainContent.on("click", "#closeProjectButton", function (e) { e.preventDefault(); diff --git a/cairis/web/dist/js/cairis/responses.js b/cairis/web/dist/js/cairis/responses.js index e5f5315a4..0e14f8281 100644 --- a/cairis/web/dist/js/cairis/responses.js +++ b/cairis/web/dist/js/cairis/responses.js @@ -591,7 +591,6 @@ function putResponse(response, oldName, callback){ output.object = response; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -623,7 +622,6 @@ function postResponse(response, callback){ output.object = response; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", @@ -650,17 +648,31 @@ function postResponse(response, callback){ }); } -mainContent.on('click', '#UpdateResponse', function (e) { - e.preventDefault(); - $("#editResponseOptionsform").validator(); +function commitResponse() { var resp = JSON.parse($.session.get("response")); var respKind = $.session.get("responseKind"); + if (resp.theEnvironmentProperties[respKind.toLowerCase()].length == 0) { alert("Environments not defined"); + return; } - else { + if ((respKind == 'Accept') && ($('#theAcceptanceCost').val() == undefined)) { + alert("Cost of accepting risk not specified"); + return; + } + var valid = true; + if (respKind == 'Transfer') { + $.each(resp.theEnvironmentProperties[respKind.toLowerCase()],function(idx,env) { + if (env['theRoles'].length == 0) { + alert("Risk not transferred to any roles in environment" + env.theEnvironmentName); + valid = false; + return; + } + }); + } + if (valid) { resp.theName = $("#theResponseName").val(); var arr = $("#theTags").val().split(", ") if(arr[0] != "") { @@ -683,4 +695,4 @@ mainContent.on('click', '#UpdateResponse', function (e) { }); } } -}); +} diff --git a/cairis/web/dist/js/cairis/risks.js b/cairis/web/dist/js/cairis/risks.js index a7aa21480..ca3cf709d 100644 --- a/cairis/web/dist/js/cairis/risks.js +++ b/cairis/web/dist/js/cairis/risks.js @@ -446,10 +446,10 @@ function appendMisuseEnvironment(environment){ $("#theMisuseEnvironments").find("tbody").append(''+environment+''); } -mainContent.on('click', '#UpdateRisk', function (e) { - e.preventDefault(); +function commitRisk() { var risk = JSON.parse($.session.get("Risk")); var oldName = risk.theName; + risk.theName = $("#theName").val(); risk.theRiskName = $("#theName").val(); risk.theThreatName = $("#theThreatNames").val(); risk.theVulnerabilityName = $("#theVulnerabilityNames").val(); @@ -471,7 +471,7 @@ mainContent.on('click', '#UpdateRisk', function (e) { refreshMenuBreadCrumb('risk'); }); } -}); +} mainContent.on('click', '#CloseRisk', function (e) { e.preventDefault(); @@ -534,7 +534,6 @@ function putRisk(risk, oldName, callback){ output.object = risk; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -566,7 +565,6 @@ function postRisk(risk, callback){ output.object = risk; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/roles.js b/cairis/web/dist/js/cairis/roles.js index dcb49c613..b6b50567a 100644 --- a/cairis/web/dist/js/cairis/roles.js +++ b/cairis/web/dist/js/cairis/roles.js @@ -139,9 +139,7 @@ function viewRole(roleName) { }; var mainContent = $("#objectViewer"); -mainContent.on('click','#UpdateRole', function (event) { - event.preventDefault(); - +function commitRole() { if ($("#editRoleOptionsform").hasClass("newRole")) { var theRoleObject = jQuery.extend(true, {},roleDefaultObject ); theRoleObject.theName = mainContent.find("#theName").val(); @@ -175,7 +173,7 @@ mainContent.on('click','#UpdateRole', function (event) { }); } } -}); +} $(document).on('click',"td.deleteRoleButton",function(event){ event.preventDefault(); @@ -256,7 +254,6 @@ function updateRole(role, oldName, callback){ output.object = role; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -289,7 +286,6 @@ function postRole(role, callback){ output.object = role; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/securitypatterns.js b/cairis/web/dist/js/cairis/securitypatterns.js index 298cba529..c130beede 100644 --- a/cairis/web/dist/js/cairis/securitypatterns.js +++ b/cairis/web/dist/js/cairis/securitypatterns.js @@ -157,8 +157,8 @@ $(document).on("click", "#addNewSecurityPattern", function () { }); var mainContent = $("#objectViewer"); -mainContent.on("click","#UpdateSecurityPattern",function(e) { - e.preventDefault(); + +function commitSecurityPattern() { var sp = JSON.parse($.session.get("SecurityPattern")); if ($("#editSecurityPatternOptionsForm").hasClass("new")) { sp.theName = $('#theName').val(); @@ -182,14 +182,13 @@ mainContent.on("click","#UpdateSecurityPattern",function(e) { refreshMenuBreadCrumb('security_pattern'); }); } -}); +} function postSecurityPattern(sp, callback){ var output = {}; output.object = sp; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", @@ -221,7 +220,6 @@ function putSecurityPattern(sp, oldName, callback){ output.object = sp; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -491,7 +489,6 @@ function situateSecurityPattern() { var output = {}; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/taskcharacteristics.js b/cairis/web/dist/js/cairis/taskcharacteristics.js index bb40e2e03..b99554594 100644 --- a/cairis/web/dist/js/cairis/taskcharacteristics.js +++ b/cairis/web/dist/js/cairis/taskcharacteristics.js @@ -155,8 +155,7 @@ $(document).on('click', "td.taskcharacteristic-rows", function () { }); var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdateTaskCharacteristic', function (e) { - e.preventDefault(); +function commitTaskCharacteristic() { var tc = JSON.parse($.session.get("TaskCharacteristic")); var oldName = tc.theCharacteristic; tc.theTaskName = $("#theTaskName").val(); @@ -176,7 +175,7 @@ mainContent.on('click', '#UpdateTaskCharacteristic', function (e) { refreshMenuBreadCrumb('task_characteristic'); }); } -}); +} $(document).on('click', 'td.deleteTaskCharacteristicButton', function (e) { e.preventDefault(); @@ -225,7 +224,6 @@ function putTaskCharacteristic(tc, oldName, callback){ output.object = tc; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -257,7 +255,6 @@ function postTaskCharacteristic(tc, callback){ output.object = tc; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/tasks.js b/cairis/web/dist/js/cairis/tasks.js index c9caa339e..576a29d18 100644 --- a/cairis/web/dist/js/cairis/tasks.js +++ b/cairis/web/dist/js/cairis/tasks.js @@ -466,8 +466,7 @@ function addTaskEnvironment() { }); }; -mainContent.on('click', '#UpdateTask', function (e) { - e.preventDefault(); +function commitTask() { var task = JSON.parse($.session.get("Task")); if (task.theEnvironmentProperties.length == 0) { alert("Environments not defined"); @@ -509,7 +508,7 @@ mainContent.on('click', '#UpdateTask', function (e) { }); } } -}); +} $(document).on('click', 'td.deleteTaskButton', function (e) { e.preventDefault(); @@ -563,7 +562,6 @@ function putTask(task, oldName, callback){ output.object = task; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -595,7 +593,6 @@ function postTask(task, callback){ output.object = task; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/templateassets.js b/cairis/web/dist/js/cairis/templateassets.js index b0a280370..c7f847ab5 100644 --- a/cairis/web/dist/js/cairis/templateassets.js +++ b/cairis/web/dist/js/cairis/templateassets.js @@ -328,8 +328,7 @@ function appendTemplateSecurityProperty(label,value,rationale){ $("#theTemplateProperties").find("tbody").append('' + label + '
' + label + ''+ value +''+ rationale +'').animate('slow'); }; -mainContent.on('click', '#UpdateTemplateAsset',function(e){ - e.preventDefault(); +function commitTemplateAsset() { var ta = $.session.get("TemplateAsset"); if($("#editTemplateAssetOptionsform").hasClass("new")){ postTemplateAssetForm($("#editTemplateAssetOptionsform"), function(){}); @@ -338,7 +337,7 @@ mainContent.on('click', '#UpdateTemplateAsset',function(e){ putTemplateAssetForm($("#editTemplateAssetOptionsform")); } refreshMenuBreadCrumb('template_asset'); -}); +} mainContent.on('click', '#CloseTemplateAsset', function (e) { e.preventDefault(); diff --git a/cairis/web/dist/js/cairis/templategoals.js b/cairis/web/dist/js/cairis/templategoals.js index db08e2049..044f37d12 100644 --- a/cairis/web/dist/js/cairis/templategoals.js +++ b/cairis/web/dist/js/cairis/templategoals.js @@ -193,8 +193,8 @@ $(document).on('click', "td.deleteTemplateGoalButton",function(e){ }); var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdateTemplateGoal',function(e){ - e.preventDefault(); + +function commitTemplateGoal(){ var tg = $.session.get("TemplateGoal"); if($("#editTemplateGoalOptionsForm").hasClass("new")){ postTemplateGoalForm($("#editTemplateGoalOptionsForm"), function(){createTemplateGoalsTable();}); @@ -204,7 +204,7 @@ mainContent.on('click', '#UpdateTemplateGoal',function(e){ putTemplateGoalForm($("#editTemplateGoalOptionsForm")); createTemplateGoalsTable(); } -}); +} mainContent.on('click', '#CloseTemplateGoal', function (e) { e.preventDefault(); diff --git a/cairis/web/dist/js/cairis/templaterequirements.js b/cairis/web/dist/js/cairis/templaterequirements.js index 3b72094f4..b18ee7453 100644 --- a/cairis/web/dist/js/cairis/templaterequirements.js +++ b/cairis/web/dist/js/cairis/templaterequirements.js @@ -227,8 +227,7 @@ $(document).on('click', "td.deleteTemplateRequirementButton",function(e){ }); }); -mainContent.on('click', '#UpdateTemplateRequirement',function(e){ - e.preventDefault(); +function commitTemplateRequirement() { var tr = $.session.get("TemplateRequirement"); if($("#editTemplateRequirementOptionsForm").hasClass("new")){ postTemplateRequirementForm($("#editTemplateRequirementOptionsForm"), function(){createTemplateRequirementsTable();}); @@ -237,7 +236,7 @@ mainContent.on('click', '#UpdateTemplateRequirement',function(e){ putTemplateRequirementForm($("#editTemplateRequirementOptionsForm")); createTemplateRequirementsTable(); } -}); +} mainContent.on('click', '#CloseTemplateRequirement', function (e) { e.preventDefault(); diff --git a/cairis/web/dist/js/cairis/threats.js b/cairis/web/dist/js/cairis/threats.js index 050728e22..8b8adc976 100644 --- a/cairis/web/dist/js/cairis/threats.js +++ b/cairis/web/dist/js/cairis/threats.js @@ -422,9 +422,7 @@ function addThreatEnvironment() { }); }; -mainContent.on('click', '#UpdateThreat', function (e) { - e.preventDefault(); - var test = $.session.get("theThreat"); +function commitThreat() { var threat = JSON.parse($.session.get("theThreat")); if (threat.theEnvironmentProperties.length == 0) { alert("Environments not defined"); @@ -452,7 +450,7 @@ mainContent.on('click', '#UpdateThreat', function (e) { }); } } -}); +} mainContent.on('click', ".deleteThreatEnv", function () { var envi = $(this).next(".threatEnvironments").text(); @@ -572,7 +570,6 @@ function putThreat(threat, oldName, callback){ output.object = threat; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -604,7 +601,6 @@ function postThreat(threat, callback){ output.object = threat; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/trustboundaries.js b/cairis/web/dist/js/cairis/trustboundaries.js index 8f8a0a4a5..ac72b926c 100644 --- a/cairis/web/dist/js/cairis/trustboundaries.js +++ b/cairis/web/dist/js/cairis/trustboundaries.js @@ -112,11 +112,8 @@ function appendTrustBoundaryComponent(tbComponent) { } var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdateTrustBoundary', function (e) { - e.preventDefault(); - $("#editTrustBoundaryOptionsForm").validator(); - +function commitTrustBoundary() { var tb = JSON.parse($.session.get("TrustBoundary")); var oldTbName = tb.theName; tb.theName = $("#theTrustBoundaryName").val(); @@ -135,7 +132,7 @@ mainContent.on('click', '#UpdateTrustBoundary', function (e) { refreshMenuBreadCrumb('trust_boundary'); }); } -}); +} $(document).on("click", "#addNewTrustBoundary", function () { activeElement("objectViewer"); @@ -202,7 +199,6 @@ function putTrustBoundary(tb, oldTbName, callback){ output.object = tb; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -234,7 +230,6 @@ function postTrustBoundary(tb, callback){ output.object = tb; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/usecases.js b/cairis/web/dist/js/cairis/usecases.js index 4c435cf2b..a2110d47d 100644 --- a/cairis/web/dist/js/cairis/usecases.js +++ b/cairis/web/dist/js/cairis/usecases.js @@ -211,7 +211,6 @@ function generateObstacleFromException(exceptionIdx) { output.object = uc; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", @@ -442,8 +441,7 @@ function addUseCaseEnvironment() { }); }; -mainContent.on('click', '#UpdateUseCase', function (e) { - e.preventDefault(); +function commitUseCase() { var usecase = JSON.parse($.session.get("UseCase")); if (usecase.theEnvironmentProperties.length == 0) { alert("Environments not defined"); @@ -485,7 +483,7 @@ mainContent.on('click', '#UpdateUseCase', function (e) { }); } } -}); +} $(document).on('click', 'td.deleteUseCaseButton', function (e) { e.preventDefault(); @@ -538,7 +536,6 @@ function putUseCase(usecase, oldName, callback){ output.object = usecase; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -570,7 +567,6 @@ function postUseCase(usecase, callback){ output.object = usecase; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/valuetypes.js b/cairis/web/dist/js/cairis/valuetypes.js index 325c49170..2247c5685 100644 --- a/cairis/web/dist/js/cairis/valuetypes.js +++ b/cairis/web/dist/js/cairis/valuetypes.js @@ -132,9 +132,9 @@ function createValueTypesTable(valueType,envName){ var item = data[key]; textToInsert[i++] = ""; - if (envName == undefined) { + if (envName == undefined) { textToInsert[i++] = ''; - } + } textToInsert[i++] = ''; textToInsert[i++] = item.theName; textToInsert[i++] = ''; @@ -199,7 +199,7 @@ $(document).on('click', "td.valuetype-rows", function () { if (valueType == 'access_right' || valueType == 'protocol' || valueType == 'privilege' || valueType == 'surface_type') { $('#theScore').val(data.theScore); } - + $(formObjt).validator('update'); }); }, error: function (xhr, textStatus, errorThrown) { @@ -213,8 +213,8 @@ $(document).on('click', "td.valuetype-rows", function () { var mainContent = $("#objectViewer"); -mainContent.on('click', '#UpdateValueType', function (e) { - e.preventDefault(); + +function commitValueType() { var vt = JSON.parse($.session.get("ValueType")); var oldName = vt.theName; vt.theName = $("#theName").val(); @@ -244,7 +244,7 @@ mainContent.on('click', '#UpdateValueType', function (e) { refreshMenuBreadCrumb(vt.theType,$.session.get("environment")) }); } -}); +} $(document).on('click', 'td.deleteValueTypeButton', function (e) { e.preventDefault(); @@ -323,6 +323,7 @@ $(document).on("click", "#addNewValueType", function () { if (valueType == 'access_right' || valueType == 'protocol' || valueType == 'privilege' || valueType == 'surface_type') { formObjt = "editScoredValueTypeOptions"; } + $(formObjt).validator(); fillOptionMenu("fastTemplates/" + formObjt + ".html", "#objectViewer", null, true, true, function () { $("#UpdateValueType").text("Create"); $("#" + formObjt + "Form").addClass("new"); @@ -335,7 +336,6 @@ function putValueType(vt, oldName, callback){ output.object = vt; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); var valueType = $.session.get("value_type"); var envName = $.session.get("environment"); if (envName == undefined) { @@ -372,7 +372,6 @@ function postValueType(vt, callback){ output.object = vt; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/dist/js/cairis/vulnerabilities.js b/cairis/web/dist/js/cairis/vulnerabilities.js index e6344288a..4af63516e 100644 --- a/cairis/web/dist/js/cairis/vulnerabilities.js +++ b/cairis/web/dist/js/cairis/vulnerabilities.js @@ -237,7 +237,6 @@ function addAssetToVulnerabilityEnvironment() { prop.theAssets.push(text); } }); - debugLogger(theVul); $.session.set("Vulnerability", JSON.stringify(theVul)); }; @@ -259,10 +258,7 @@ mainContent.on("click", ".removeVulnEnvAsset", function () { $(this).closest("tr").remove(); }); -mainContent.on('click', '#UpdateVulnerability', function (e) { - - $("#editVulnerabilityOptionsform").validator(); - +function commitVulnerability() { var theVul = JSON.parse($.session.get("Vulnerability")); if (theVul.theEnvironmentProperties.length == 0) { alert("Environments not defined"); @@ -295,7 +291,7 @@ mainContent.on('click', '#UpdateVulnerability', function (e) { } } e.preventDefault(); -}); +} $(document).on('click','td.deleteVulnerabilityButton', function (event) { @@ -363,7 +359,6 @@ function putVulnerability(vuln, oldName, callback){ output.object = vuln; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "PUT", @@ -395,7 +390,6 @@ function postVulnerability(vuln, callback){ output.object = vuln; output.session_id = $.session.get('sessionID'); output = JSON.stringify(output); - debugLogger(output); $.ajax({ type: "POST", diff --git a/cairis/web/fastTemplates/editArchitecturalPatternOptions.html b/cairis/web/fastTemplates/editArchitecturalPatternOptions.html index 310263267..669a52149 100644 --- a/cairis/web/fastTemplates/editArchitecturalPatternOptions.html +++ b/cairis/web/fastTemplates/editArchitecturalPatternOptions.html @@ -1,4 +1,4 @@ -
+
diff --git a/cairis/web/fastTemplates/editAttackerOptions.html b/cairis/web/fastTemplates/editAttackerOptions.html index 061e3d5cf..2a56ad62d 100644 --- a/cairis/web/fastTemplates/editAttackerOptions.html +++ b/cairis/web/fastTemplates/editAttackerOptions.html @@ -1,4 +1,4 @@ - +
diff --git a/cairis/web/fastTemplates/editEnvironmentOptions.html b/cairis/web/fastTemplates/editEnvironmentOptions.html index 5fd289d03..d5de30734 100644 --- a/cairis/web/fastTemplates/editEnvironmentOptions.html +++ b/cairis/web/fastTemplates/editEnvironmentOptions.html @@ -1,4 +1,5 @@ +
@@ -199,4 +200,5 @@
+
diff --git a/cairis/web/fastTemplates/editGenDocOptions.html b/cairis/web/fastTemplates/editGenDocOptions.html index 712888530..6153a2b5d 100644 --- a/cairis/web/fastTemplates/editGenDocOptions.html +++ b/cairis/web/fastTemplates/editGenDocOptions.html @@ -1,4 +1,4 @@ -
+
-
-
-
diff --git a/cairis/web/fastTemplates/editLocationsOptions.html b/cairis/web/fastTemplates/editLocationsOptions.html index af81a2b77..89203a25b 100644 --- a/cairis/web/fastTemplates/editLocationsOptions.html +++ b/cairis/web/fastTemplates/editLocationsOptions.html @@ -1,4 +1,4 @@ -
+
@@ -27,7 +27,7 @@
- +
@@ -81,7 +81,7 @@

Add Asset Instance

- +
@@ -107,7 +107,7 @@

Add Persona Instance

- +
diff --git a/cairis/web/fastTemplates/editPersonaCharacteristicOptions.html b/cairis/web/fastTemplates/editPersonaCharacteristicOptions.html index 4ac17f943..4320fef80 100644 --- a/cairis/web/fastTemplates/editPersonaCharacteristicOptions.html +++ b/cairis/web/fastTemplates/editPersonaCharacteristicOptions.html @@ -1,4 +1,4 @@ - +
  • General
    • diff --git a/cairis/web/fastTemplates/editPersonasOptions.html b/cairis/web/fastTemplates/editPersonasOptions.html index 5758771e0..1bb4536e0 100644 --- a/cairis/web/fastTemplates/editPersonasOptions.html +++ b/cairis/web/fastTemplates/editPersonasOptions.html @@ -1,4 +1,4 @@ - +
    diff --git a/cairis/web/fastTemplates/editProjectSettings.html b/cairis/web/fastTemplates/editProjectSettings.html index 878ab1556..0d51d3d65 100644 --- a/cairis/web/fastTemplates/editProjectSettings.html +++ b/cairis/web/fastTemplates/editProjectSettings.html @@ -1,4 +1,4 @@ - +
    • Background
      • diff --git a/cairis/web/fastTemplates/editSearchOptions.html b/cairis/web/fastTemplates/editSearchOptions.html index 901ef39bb..93a8c7700 100644 --- a/cairis/web/fastTemplates/editSearchOptions.html +++ b/cairis/web/fastTemplates/editSearchOptions.html @@ -1,4 +1,4 @@ - +
      diff --git a/cairis/web/fastTemplates/editSecurityPatternOptions.html b/cairis/web/fastTemplates/editSecurityPatternOptions.html index ce864c6f2..1666cf0db 100644 --- a/cairis/web/fastTemplates/editSecurityPatternOptions.html +++ b/cairis/web/fastTemplates/editSecurityPatternOptions.html @@ -1,4 +1,4 @@ - +
      diff --git a/cairis/web/fastTemplates/editTaskCharacteristicOptions.html b/cairis/web/fastTemplates/editTaskCharacteristicOptions.html index 6a5c2a041..516338691 100644 --- a/cairis/web/fastTemplates/editTaskCharacteristicOptions.html +++ b/cairis/web/fastTemplates/editTaskCharacteristicOptions.html @@ -1,4 +1,4 @@ - +
      • General
        • diff --git a/cairis/web/fastTemplates/editValueTypeOptions.html b/cairis/web/fastTemplates/editValueTypeOptions.html index 90328d1e9..e8ec6402a 100644 --- a/cairis/web/fastTemplates/editValueTypeOptions.html +++ b/cairis/web/fastTemplates/editValueTypeOptions.html @@ -12,7 +12,7 @@