Skip to content

Commit

Permalink
Revert "#1949 qa debug"
Browse files Browse the repository at this point in the history
This reverts commit 755b25e.
  • Loading branch information
MorganLmd committed Sep 30, 2019
1 parent 755b25e commit f56a0f1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
6 changes: 3 additions & 3 deletions source/nb-configuration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
<libraries xmlns="http://www.netbeans.org/ns/cdnjs-libraries/1"/>
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<netbeans.compile.on.save>all</netbeans.compile.on.save>
<netbeans.hint.licensePath>${project.basedir}/licenseheader.txt</netbeans.hint.licensePath>
<org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.8-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>
<org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.7-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>
<org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>Tomcat</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
<netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
<netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
<org-netbeans-modules-css-prep.less_2e_mappings>/less:/css</org-netbeans-modules-css-prep.less_2e_mappings>
<org-netbeans-modules-css-prep.less_2e_enabled>false</org-netbeans-modules-css-prep.less_2e_enabled>
<org-netbeans-modules-css-prep.sass_2e_enabled>false</org-netbeans-modules-css-prep.sass_2e_enabled>
Expand Down
2 changes: 1 addition & 1 deletion source/src/main/webapp/META-INF/context.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
-->
<Context path="/Cerberus">
<Valve className="org.keycloak.adapters.tomcat.KeycloakAuthenticatorValve"/>
<!-- <Valve className="org.keycloak.adapters.tomcat.KeycloakAuthenticatorValve"/>-->
</Context>
12 changes: 3 additions & 9 deletions source/src/main/webapp/js/pages/TestCaseScript.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ var Tags = [];
$.when($.getScript("js/global/global.js"), $.getScript("js/global/autocomplete.js")).then(function() {
$(document).ready(function() {
loadedPropertiesNumber = -1;
console.log("valeur initiale du compteur (loadedPropertiesNumber) : " + loadedPropertiesNumber);
initModalDataLib();
$("#nav-property").on('mouseenter', 'a', function(ev) {
try {
Expand Down Expand Up @@ -559,8 +558,6 @@ function saveScript(property) {
return;
}

console.log("Controle passé, sauvegarde en cours");

// Disable the save button to avoid double click.
$("#saveScript").attr("disabled", true);

Expand Down Expand Up @@ -665,13 +662,8 @@ function saveScript(property) {
function isPropertyListDisplayed() {

var displayedPropertiesNumber = document.getElementById('propList').getElementsByTagName('li').length;
console.log("-------SAUVEGARDE--------");
console.log("nombre de propriétés récupérées : " + loadedPropertiesNumber);
console.log("nombre de propriétés affichées : " + displayedPropertiesNumber);
console.log("propriétés affichées < propriétés chargées ? " + displayedPropertiesNumber < loadedPropertiesNumber);
if (loadedPropertiesNumber === -1 || displayedPropertiesNumber < loadedPropertiesNumber) {
return false;
console.log("/!\\ ARRET /!\\");
}
return true;
}
Expand Down Expand Up @@ -1145,7 +1137,6 @@ function loadPropertiesAndDraw(test, testcase, testcaseinfo, propertyToFocus, ca
}
}
loadedPropertiesNumber = propertyList.length;
console.log("nombre de propriété récupérée de la bdd : " + loadedPropertiesNumber);
localStorage.setItem("properties", JSON.stringify(propertyList));
localStorage.setItem("secondaryProperties", JSON.stringify(propertyList));
sortProperties("#propTable");
Expand Down Expand Up @@ -1778,6 +1769,9 @@ function Step(json, stepList, canUpdate, hasPermissionsStepLibrary) {

this.html = $("<li style='padding-right:5px'></li>").addClass("list-group-item list-group-item-calm row").css("margin-left", "0px");
this.textArea = $("<div></div>").addClass("col-sm-8 textArea").addClass("step-description").text(this.description);
console.log("this inLibrary = " + this.inLibrary);
console.log("this isusestep = " + this.useStep);

}

Step.prototype.draw = function() {
Expand Down

0 comments on commit f56a0f1

Please sign in to comment.