Merge pull request #208 from shoito/fix-loss-feature-description

ff4j · Mar 20, 2017 · ff53651 · ff53651
2 parents 6f2e3b1 + 9c35253
commit ff53651
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/ff4j-web/src/main/resources/views/view-modal-properties.html b/ff4j-web/src/main/resources/views/view-modal-properties.html
@@ -46,11 +46,11 @@ <h4 id="labelCreateProperty">
 
     <!-- Description --> 
     <div class="control-group" style="margin-left:0px;float:left;margin-left:-45px">   
-      <label class="control-label" for="desc" style="color:#687684;font-style:normal" 
+      <label class="control-label" for="pDesc" style="color:#687684;font-style:normal"
              th:text="#{modal.createproperty.description}">Description</label>  
       <div class="controls">
         <textarea class="field span4" style="width:350px;color:#008bab"
-            name="desc" id="desc" rows="2" cols="30"></textarea>
+            name="desc" id="pDesc" rows="2" cols="30"></textarea>
       </div>
     </div>
 
@@ -213,11 +213,11 @@ <h4 id="myModalLabel">
 
     <!-- Description --> 
     <div class="control-group" style="margin-left:0px;float:left;margin-left:-45px">   
-      <label class="control-label" for="desc" style="color:#687684;font-style:normal" 
+      <label class="control-label" for="pDesc" style="color:#687684;font-style:normal"
              th:text="#{modal.editproperty.description}">Description</label>  
       <div class="controls">
         <textarea class="field span4" style="width:350px;color:#008bab"
-            name="desc" id="desc" rows="2" cols="30"></textarea>
+            name="desc" id="pDesc" rows="2" cols="30"></textarea>
       </div>
     </div>
 
@@ -312,15 +312,15 @@ <h4 id="myModalLabel">
         // Fetch information from the feature
         $.get('api/features/' + featureId, function(myFeature) {
            var myProperty = myFeature.customProperties[propertyName];
-           modalEditProperty.find("#desc").val(myProperty.description);
+           modalEditProperty.find("#pDesc").val(myProperty.description);
            modalEditProperty.find("#pType").val(myProperty.type);
            modalEditProperty.find("#pValue").val(myProperty.value);
         });
     });
 
     $(document).on("click", ".open-createPropertyDialog", function () { 
         $(".modal-body #name").val('');
-        $(".modal-body #desc").val('');
+        $(".modal-body #pDesc").val('');
         $(".modal-body #pType").val('');
         $(".modal-body #pValue").val('');
         var featId = $(this).data('featureid');