SilentLittleCat před 7 roky
rodič
revize
2e2029bfd4
2 změnil soubory, kde provedl 18 přidání a 18 odebrání
  1. 17 17
      .idea/workspace.xml
  2. 1 1
      source/module/group/group_index.php

+ 17 - 17
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd
@@ -16,8 +16,8 @@
       <file leaf-file-name="group_index.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="202">
-              <caret line="147" column="21" lean-forward="true" selection-start-line="147" selection-start-column="21" selection-end-line="147" selection-end-column="21" />
+            <state relative-caret-position="264">
+              <caret line="149" column="85" lean-forward="false" selection-start-line="149" selection-start-column="85" selection-end-line="149" selection-end-column="85" />
               <folding />
             </state>
           </provider>
@@ -26,7 +26,7 @@
       <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-11597">
+            <state relative-caret-position="-11504">
               <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
@@ -37,7 +37,7 @@
         <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="398">
-              <caret line="271" column="43" lean-forward="false" selection-start-line="271" selection-start-column="20" selection-end-line="271" selection-end-column="43" />
+              <caret line="271" column="68" lean-forward="false" selection-start-line="271" selection-start-column="56" selection-end-line="271" selection-end-column="68" />
               <folding>
                 <marker date="1523670581496" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
                 <marker date="1523670581496" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
@@ -324,12 +324,12 @@
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
       <workItem from="1525658293907" duration="23514000" />
-      <workItem from="1525701498505" duration="1475000" />
+      <workItem from="1525701498505" duration="1597000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="50863000" />
+    <option name="totallyTimeSpent" value="50985000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -735,10 +735,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-11504">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="398">
-          <caret line="271" column="43" lean-forward="false" selection-start-line="271" selection-start-column="20" selection-end-line="271" selection-end-column="43" />
+          <caret line="271" column="68" lean-forward="false" selection-start-line="271" selection-start-column="56" selection-end-line="271" selection-end-column="68" />
           <folding>
             <marker date="1523670581496" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
             <marker date="1523670581496" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
@@ -780,18 +788,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-11597">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="147" column="21" lean-forward="true" selection-start-line="147" selection-start-column="21" selection-end-line="147" selection-end-column="21" />
+        <state relative-caret-position="264">
+          <caret line="149" column="85" lean-forward="false" selection-start-line="149" selection-start-column="85" selection-end-line="149" selection-end-column="85" />
           <folding />
         </state>
       </provider>

+ 1 - 1
source/module/group/group_index.php

xqd
@@ -147,7 +147,7 @@ if(!$metadescription) {
 
 if(empty($curtype)) {
     if(!empty($_GET['province'])) {
-        $item = C::t('forum_forum')->fetch_all_for_grouplist();
+        $item = C::t('forum_forum')->fetch_all_for_grouplist('displayorder', '*', 10);
         print_r($item);
         include template('diy:group/area');
     } else {