Working Copy
authorwunschtacho <wunschtacho@735d13b6-9817-0410-8766-e36946ffe9aa>
Thu, 18 Oct 2012 10:07:24 +0000 (10:07 +0000)
committerwunschtacho <wunschtacho@735d13b6-9817-0410-8766-e36946ffe9aa>
Thu, 18 Oct 2012 10:07:24 +0000 (10:07 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/powermail_cond/trunk@67258 735d13b6-9817-0410-8766-e36946ffe9aa

.idea/workspace.xml
Classes/Utility/FieldlistingBackend.php
Resources/Public/Js/PowermailCond.js

index b917568..ac0ff73 100644 (file)
@@ -3,6 +3,7 @@
   <component name="ChangeListManager">\r
     <list default="true" readonly="true" id="500e5988-e13b-4ba1-8a60-e63a97f737a1" name="Default" comment="">\r
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />\r
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php" afterPath="$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php" />\r
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js" afterPath="$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js" />\r
     </list>\r
     <ignored path="powermail_cond@powermailt347.in2code.de.iws" />\r
   </component>\r
   <component name="FileEditorManager">\r
     <leaf>\r
-      <file leaf-file-name="PowermailCond.js" pinned="false" current="true" current-in-tab="true">\r
+      <file leaf-file-name="PowermailCond.js" pinned="false" current="false" current-in-tab="false">\r
         <entry file="file://$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js">\r
           <provider selected="true" editor-type-id="text-editor">\r
-            <state line="176" column="62" selection-start="6708" selection-end="6708" vertical-scroll-proportion="0.475">\r
+            <state line="220" column="43" selection-start="7761" selection-end="7761" vertical-scroll-proportion="-18.16">\r
+              <folding />\r
+            </state>\r
+          </provider>\r
+        </entry>\r
+      </file>\r
+      <file leaf-file-name="Condition.php" pinned="false" current="false" current-in-tab="false">\r
+        <entry file="file://$PROJECT_DIR$/Configuration/TCA/Condition.php">\r
+          <provider selected="true" editor-type-id="text-editor">\r
+            <state line="103" column="30" selection-start="3295" selection-end="3295" vertical-scroll-proportion="-10.461538">\r
+              <folding />\r
+            </state>\r
+          </provider>\r
+        </entry>\r
+      </file>\r
+      <file leaf-file-name="FieldlistingBackend.php" pinned="false" current="true" current-in-tab="true">\r
+        <entry file="file://$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php">\r
+          <provider selected="true" editor-type-id="text-editor">\r
+            <state line="56" column="34" selection-start="2198" selection-end="2198" vertical-scroll-proportion="0.4100877">\r
               <folding />\r
             </state>\r
           </provider>\r
@@ -46,7 +65,6 @@
       <list>\r
         <option value="$PROJECT_DIR$/Resources/Private/Language/locallang_db.xml" />\r
         <option value="$PROJECT_DIR$/Configuration/TCA/Rule.php" />\r
-        <option value="$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php" />\r
         <option value="$PROJECT_DIR$/oldFiles/js/powermail_cond.js" />\r
         <option value="$PROJECT_DIR$/Configuration/TypoScript/PowermailCond.js" />\r
         <option value="$PROJECT_DIR$/oldFiles/static/setup.txt" />\r
         <option value="$PROJECT_DIR$/Resources/Public/Css/PowermailCond.css" />\r
         <option value="$PROJECT_DIR$/Configuration/TypoScript/setup.txt" />\r
         <option value="$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js" />\r
+        <option value="$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php" />\r
       </list>\r
     </option>\r
   </component>\r
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />\r
   <component name="ProjectFrameBounds">\r
-    <option name="x" value="-8" />\r
-    <option name="y" value="-8" />\r
-    <option name="width" value="1616" />\r
-    <option name="height" value="916" />\r
+    <option name="x" value="1592" />\r
+    <option name="y" value="-262" />\r
+    <option name="width" value="1936" />\r
+    <option name="height" value="1096" />\r
   </component>\r
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">\r
     <OptionsSetting value="true" id="Add" />\r
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
             </PATH_ELEMENT>\r
             <PATH_ELEMENT>\r
-              <option name="myItemId" value="Resources" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Public" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Js" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-          </PATH>\r
-          <PATH>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="powermail_cond@powermailt347.in2code.de" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="powermail_cond@powermailt347.in2code.de" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Resources" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Public" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-          </PATH>\r
-          <PATH>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="powermail_cond@powermailt347.in2code.de" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="powermail_cond@powermailt347.in2code.de" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Resources" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Public" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Css" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-          </PATH>\r
-          <PATH>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="powermail_cond@powermailt347.in2code.de" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="powermail_cond@powermailt347.in2code.de" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Resources" />\r
+              <option name="myItemId" value="Configuration" />\r
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
             </PATH_ELEMENT>\r
           </PATH>\r
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
             </PATH_ELEMENT>\r
             <PATH_ELEMENT>\r
-              <option name="myItemId" value="TypoScript" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-          </PATH>\r
-          <PATH>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="powermail_cond@powermailt347.in2code.de" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="powermail_cond@powermailt347.in2code.de" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Configuration" />\r
+              <option name="myItemId" value="TCA" />\r
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
             </PATH_ELEMENT>\r
           </PATH>\r
       <created>1350551625105</created>\r
       <updated>1350551625105</updated>\r
     </task>\r
-    <option name="localTasksCounter" value="11" />\r
+    <task id="LOCAL-00011" summary="Working Copy">\r
+      <created>1350552408102</created>\r
+      <updated>1350552408102</updated>\r
+    </task>\r
+    <option name="localTasksCounter" value="12" />\r
     <servers />\r
   </component>\r
   <component name="ToolWindowManager">\r
-    <frame x="-8" y="-8" width="1616" height="916" extended-state="6" />\r
+    <frame x="1592" y="-262" width="1936" height="1096" extended-state="6" />\r
     <editor active="true" />\r
     <layout>\r
       <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />\r
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />\r
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32917964" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />\r
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />\r
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18146718" sideWeight="0.32694763" order="1" side_tool="true" content_ui="tabs" />\r
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18146718" sideWeight="0.6641124" order="0" side_tool="false" content_ui="combo" />\r
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15048026" sideWeight="0.3271028" order="1" side_tool="true" content_ui="tabs" />\r
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15048026" sideWeight="0.66562825" order="0" side_tool="false" content_ui="combo" />\r
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />\r
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />\r
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />\r
         </state>\r
       </provider>\r
     </entry>\r
+    <entry file="file://$PROJECT_DIR$/Configuration/TCA/Condition.php">\r
+      <provider selected="true" editor-type-id="text-editor">\r
+        <state line="103" column="30" selection-start="3295" selection-end="3295" vertical-scroll-proportion="-10.461538">\r
+          <folding />\r
+        </state>\r
+      </provider>\r
+    </entry>\r
     <entry file="file://$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="176" column="62" selection-start="6708" selection-end="6708" vertical-scroll-proportion="0.475">\r
+        <state line="220" column="43" selection-start="7761" selection-end="7761" vertical-scroll-proportion="-18.16">\r
+          <folding />\r
+        </state>\r
+      </provider>\r
+    </entry>\r
+    <entry file="file://$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php">\r
+      <provider selected="true" editor-type-id="text-editor">\r
+        <state line="56" column="34" selection-start="2198" selection-end="2198" vertical-scroll-proportion="0.4100877">\r
           <folding />\r
         </state>\r
       </provider>\r
index ff20186..c624fc7 100644 (file)
@@ -54,6 +54,9 @@ class Tx_PowermailCond_Utility_FieldlistingBackend {
                        left join tx_powermail_domain_model_forms on tx_powermail_domain_model_pages.forms = tx_powermail_domain_model_forms.uid
                ';
                $where = 'tx_powermail_domain_model_fields.hidden = 0 AND tx_powermail_domain_model_fields.deleted = 0';
+               if (isset($params['config']['itemsProcFuncValue'])) { // we want only some fields for starting fields
+                       $where .= ' and tx_powermail_domain_model_fields.type in ("input", "textarea", "select", "radio", "check")';
+               }
                if ($formUid > 0) {
                        $where .= ' AND tx_powermail_domain_model_forms.uid = ' . $formUid;
                }
index d83fb33..7c211f1 100644 (file)
@@ -23,7 +23,7 @@ jQuery(document).ready(function() {
        });
 
        // save values via ajax to session
-       $('.powermail_input, .powermail_textarea, .powermail_select, .powermail_radio, .powermail_checkbox').bind('change, keyup', function() {
+       $('.powermail_input, .powermail_textarea, .powermail_select, .powermail_radio, .powermail_checkbox').bind('change', function() {
                $this = $(this); // caching
                var formUid = $('input[name="tx_powermail_pi1[form]"]').val(); // form uid
                var url = base + '/index.php';
@@ -136,7 +136,7 @@ function doAction(list) {
  * @return     void
  */
 function hideField(uid) {
-       $('.powermail_fieldwrap_' + uid).fadeOut('fast'); // hide current field
+       $('.powermail_fieldwrap_' + uid).hide(); // hide current field
        if ($('.powermail_fieldwrap_' + uid + ' .powermail_field').val() != '') { // only if value is not yet empty
                clearValue('.powermail_fieldwrap_' + uid + ' .powermail_field'); // clear value of current field
                clearSession(uid); // clear value of current field
@@ -152,7 +152,7 @@ function hideField(uid) {
 function hideFieldset(string) {
        var params = string.split(':'); // filter / uid / values
        var values = params[2].split(';'); // value1 / value2 / value3
-       $('powermail_fieldset_' + params[1]).fadeOut('fast'); // hide current fieldset
+       $('powermail_fieldset_' + params[1]).hide(); // hide current fieldset
        for (var k=0; k < values.length; k++) { // one loop for every field inside the fieldset
                clearValue('.powermail_fieldwrap_' + values[k] + ' .powermail_field'); // clear value of current field
        }
@@ -185,7 +185,7 @@ function filterSelection(string) {
  * @return void
  */
 function showAll() {
-       $('.powermail_fieldwrap, .powermail_fieldset').fadeIn('fast'); // show all fields and fieldsets
+       $('.powermail_fieldwrap, .powermail_fieldset').show(); // show all fields and fieldsets
 }
 
 /**