Changeset 734391

Timestamp:

06/30/2013 09:56:08 PM (13 years ago)

Author:

lubchik

Message:

Javascript definitions bugs fixes

Location:

dynamic-plugin

Files:

• tags/3.0.4/DF_DataBase.php (modified) (1 diff)
• tags/3.0.4/DF_DefineDefinitions.php (modified) (3 diffs)
• tags/3.0.4/jscripts/DF_DefineDefinitions.js (modified) (2 diffs)
• trunk/DF_DataBase.php (modified) (1 diff)
• trunk/DF_DefineDefinitions.php (modified) (3 diffs)
• trunk/jscripts/DF_DefineDefinitions.js (modified) (2 diffs)

dynamic-plugin/tags/3.0.4/DF_DataBase.php

@@ -1578 +1578 @@
                              if($row["is_must"]=="1")
                              {
-                                      $required="<font color='red'>*</font>";
+                                      $required="1";
                              }
                             $result.="<input type='image' title='".DF_DBFuncs::translate('Add To Form')."' src='".$dir."/images/Add.png' onClick='return DF_AddDoTinyMCEWithLabelDesigned(\"".$row["system_name"]."\",\"".$row["name"]."\", \"".$required."\")'  />";

dynamic-plugin/tags/3.0.4/DF_DefineDefinitions.php

@@ -104 +104 @@
             
         </tr>
+          <tr>                   <td colspan="2"><label for="values"><?php echo DF_DBFuncs::translate("Values")?></label></td>
+             </tr>
+             
+              <tr>
+                    <td colspan="2"><textarea name="values" id="values" cols="70" rows="2"></textarea></td>
+                </tr>
         
          
@@ -115 +121 @@
             </td>
              </tr>
+             
        
        
@@ -145 +152 @@
                    
             </tr>
-             <tr>                   <td colspan="2"><label for="values"><?php echo DF_DBFuncs::translate("Values")?></label></td>
-             </tr>
-             
-           
-            <tr>
-                    <td colspan="2"><textarea name="values" id="values" cols="70" rows="2"></textarea></td>
-                </tr>
+           
+             
+           
+           
              
            

dynamic-plugin/tags/3.0.4/jscripts/DF_DefineDefinitions.js

@@ -22 +22 @@
              {
             var newValue = DF_RemoveImpossible(field.value);
+              if(newValue=="" && field.value!="")
+              {
+                  var randomnumber=Math.floor(Math.random()*100000);
+                  newValue="field_"+randomnumber;
+              }
            document.forms["defineDefinitionForm"]["system_name"].value= newValue;
              }
@@ -180 +185 @@
          {
             
-             return "<p><label for='[@id|"+sysname+"@]'><b>"+labelName+":</b></label>"+required+"<br /> [@" + sysname + "@]</p>";
+             var requiredHtml=required;
+              if(required=="1")
+              {
+                  requiredHtml="<font color='red'>*</font>";
+              }
+             return "<p><label for='[@id|"+sysname+"@]'><b>"+labelName+":</b></label>"+requiredHtml+"<br /> [@" + sysname + "@]</p>";
          }
          

dynamic-plugin/trunk/DF_DataBase.php

@@ -1578 +1578 @@
                              if($row["is_must"]=="1")
                              {
-                                      $required="<font color='red'>*</font>";
+                                      $required="1";
                              }
                             $result.="<input type='image' title='".DF_DBFuncs::translate('Add To Form')."' src='".$dir."/images/Add.png' onClick='return DF_AddDoTinyMCEWithLabelDesigned(\"".$row["system_name"]."\",\"".$row["name"]."\", \"".$required."\")'  />";

dynamic-plugin/trunk/DF_DefineDefinitions.php

@@ -104 +104 @@
             
         </tr>
+          <tr>                   <td colspan="2"><label for="values"><?php echo DF_DBFuncs::translate("Values")?></label></td>
+             </tr>
+             
+              <tr>
+                    <td colspan="2"><textarea name="values" id="values" cols="70" rows="2"></textarea></td>
+                </tr>
         
          
@@ -115 +121 @@
             </td>
              </tr>
+             
        
        
@@ -145 +152 @@
                    
             </tr>
-             <tr>                   <td colspan="2"><label for="values"><?php echo DF_DBFuncs::translate("Values")?></label></td>
-             </tr>
-             
-           
-            <tr>
-                    <td colspan="2"><textarea name="values" id="values" cols="70" rows="2"></textarea></td>
-                </tr>
+           
+             
+           
+           
              
            

dynamic-plugin/trunk/jscripts/DF_DefineDefinitions.js

@@ -22 +22 @@
              {
             var newValue = DF_RemoveImpossible(field.value);
+              if(newValue=="" && field.value!="")
+              {
+                  var randomnumber=Math.floor(Math.random()*100000);
+                  newValue="field_"+randomnumber;
+              }
            document.forms["defineDefinitionForm"]["system_name"].value= newValue;
              }
@@ -180 +185 @@
          {
             
-             return "<p><label for='[@id|"+sysname+"@]'><b>"+labelName+":</b></label>"+required+"<br /> [@" + sysname + "@]</p>";
+             var requiredHtml=required;
+              if(required=="1")
+              {
+                  requiredHtml="<font color='red'>*</font>";
+              }
+             return "<p><label for='[@id|"+sysname+"@]'><b>"+labelName+":</b></label>"+requiredHtml+"<br /> [@" + sysname + "@]</p>";
          }