SilentLittleCat пре 7 година
родитељ
комит
7734465823
2 измењених фајлова са 21 додато и 17 уклоњено
  1. 16 16
      .idea/workspace.xml
  2. 5 1
      data/template/3_diy_group_group.tpl.php

+ 16 - 16
.idea/workspace.xml

@@ -90,10 +90,10 @@
       <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
       <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="594">
-              <caret line="1459" column="20" lean-forward="false" selection-start-line="1459" selection-start-column="20" selection-end-line="1459" selection-end-column="20" />
+            <state relative-caret-position="625">
+              <caret line="1463" column="86" lean-forward="true" selection-start-line="1463" selection-start-column="86" selection-end-line="1463" selection-end-column="86" />
               <folding>
               <folding>
-                <marker date="1525660168754" expanded="true" signature="18891:18903" ph="..." />
+                <marker date="1525660304152" expanded="true" signature="18891:18903" ph="..." />
               </folding>
               </folding>
             </state>
             </state>
           </provider>
           </provider>
@@ -102,8 +102,8 @@
       <file leaf-file-name="area.js" pinned="false" current-in-tab="false">
       <file leaf-file-name="area.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data/cache/area-select/area.js">
         <entry file="file://$PROJECT_DIR$/data/cache/area-select/area.js">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="16549">
-              <caret line="416" column="19" lean-forward="false" selection-start-line="416" selection-start-column="9" selection-end-line="416" selection-end-column="19" />
+            <state relative-caret-position="739">
+              <caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
               <folding />
               <folding />
             </state>
             </state>
           </provider>
           </provider>
@@ -323,12 +323,12 @@
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
       <workItem from="1525612433789" duration="9986000" />
-      <workItem from="1525658293907" duration="1866000" />
+      <workItem from="1525658293907" duration="2002000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="27740000" />
+    <option name="totallyTimeSpent" value="27876000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -371,7 +371,7 @@
         <state relative-caret-position="25978">
         <state relative-caret-position="25978">
           <caret line="836" column="128" lean-forward="false" selection-start-line="836" selection-start-column="114" selection-end-line="836" selection-end-column="128" />
           <caret line="836" column="128" lean-forward="false" selection-start-line="836" selection-start-column="114" selection-end-line="836" selection-end-column="128" />
           <folding>
           <folding>
-            <marker date="1525660168754" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525660304152" expanded="true" signature="18891:18903" ph="..." />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
@@ -468,7 +468,7 @@
         <state relative-caret-position="43679">
         <state relative-caret-position="43679">
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <folding>
           <folding>
-            <marker date="1525660168754" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525660304152" expanded="true" signature="18891:18903" ph="..." />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
@@ -527,7 +527,7 @@
         <state relative-caret-position="43679">
         <state relative-caret-position="43679">
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <folding>
           <folding>
-            <marker date="1525660168754" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525660304152" expanded="true" signature="18891:18903" ph="..." />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
@@ -537,7 +537,7 @@
         <state relative-caret-position="23901">
         <state relative-caret-position="23901">
           <caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
           <caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
           <folding>
           <folding>
-            <marker date="1525660168754" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525660304152" expanded="true" signature="18891:18903" ph="..." />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
@@ -799,18 +799,18 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/data/cache/area-select/area.js">
     <entry file="file://$PROJECT_DIR$/data/cache/area-select/area.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="16549">
-          <caret line="416" column="19" lean-forward="false" selection-start-line="416" selection-start-column="9" selection-end-line="416" selection-end-column="19" />
+        <state relative-caret-position="739">
+          <caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="594">
-          <caret line="1459" column="20" lean-forward="false" selection-start-line="1459" selection-start-column="20" selection-end-line="1459" selection-end-column="20" />
+        <state relative-caret-position="625">
+          <caret line="1463" column="86" lean-forward="true" selection-start-line="1463" selection-start-column="86" selection-end-line="1463" selection-end-column="86" />
           <folding>
           <folding>
-            <marker date="1525660168754" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525660304152" expanded="true" signature="18891:18903" ph="..." />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>

+ 5 - 1
data/template/3_diy_group_group.tpl.php

@@ -1455,9 +1455,13 @@ EOF;
 
 
         <?php if($_GET['op'] == 'group') { ?>
         <?php if($_GET['op'] == 'group') { ?>
             var province = "<?php echo $_G['forum']['province'] ?>";
             var province = "<?php echo $_G['forum']['province'] ?>";
-            console.log('ok', province);
             sgjQuery('#s_province option[value=' + province + ']').attr('selected', true);
             sgjQuery('#s_province option[value=' + province + ']').attr('selected', true);
             change(1);
             change(1);
+            var city = "<?php echo $_G['forum']['city'] ?>";
+            sgjQuery('#s_city option[value=' + city + ']').attr('selected', true);
+            change(2);
+            var county = "<?php echo $_G['forum']['county'] ?>";
+            sgjQuery('#s_county option[value=' + county + ']').attr('selected', true);
         <?php } ?>
         <?php } ?>
 
 
     </script>
     </script>