Mercurial > hg > fapweb

changeset 461:ac7357d52ff6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moar work.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 06 Dec 2013 18:55:04 +0200
parents 7d732915dce9
children 52d11e7e9d62
files admajax.php admin.php
diffstat 2 files changed, 23 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/admajax.php	Fri Dec 06 18:45:05 2013 +0200
+++ b/admajax.php	Fri Dec 06 18:55:04 2013 +0200
@@ -340,7 +340,7 @@
 function stGetInfoRotationListEditData($indent, $outer, $list_id)
 {
   $sql = stPrepareSQL(
-    "SELECT displaySlides.* FROM displaySlides ".
+    "SELECT displaySlides.*,rotationListSlides.order_num FROM displaySlides ".
     "LEFT JOIN rotationListSlides ON displaySlides.id=rotationListSlides.slide_id ".
     "WHERE rotationListSlides.list_id=%d ".
     "ORDER BY rotationListSlides.order_num DESC",
@@ -352,7 +352,8 @@
   {
     foreach ($res as $item)
     {
-      $str .= $indent."  ".stGetOptionListItem($item["id"], FALSE, $item["title"]);
+      $str .= $indent."  ".
+        stGetOptionListItem($item["id"]."_".$item["order_num"], FALSE, $item["title"]);
     }
   }
 
@@ -774,6 +775,7 @@
       case "moveRotationListSlide":
         if (stChkRequestItem("list_id", $list_id, array(CHK_TYPE, VT_INT, "Invalid data.")) &&
             stChkRequestItem("slide_id", $slide_id, array(CHK_TYPE, VT_INT, "Invalid data.")) &&
+            stChkRequestItem("order_num", $order_num, array(CHK_TYPE, VT_INT, "Invalid data.")) &&
             stChkRequestItem("dir", $dir, array(CHK_TYPE, VT_INT, "Invalid data.")))
         {
         }
@@ -798,10 +800,11 @@
 
       case "removeRotationListSlide":
         if (stChkRequestItem("list_id", $list_id, array(CHK_TYPE, VT_INT, "Invalid data.")) &&
-            stChkRequestItem("slide_id", $slide_id, array(CHK_TYPE, VT_INT, "Invalid data.")))
+            stChkRequestItem("slide_id", $slide_id, array(CHK_TYPE, VT_INT, "Invalid data.")) &&
+            stChkRequestItem("order_num", $order_num, array(CHK_TYPE, VT_INT, "Invalid data.")))
         {
-          $sql = stPrepareSQL("DELETE FROM rotationListSlides WHERE list_id=%d AND slide_id=%d",
-            $list_id, $slide_id);
+          $sql = stPrepareSQL("DELETE FROM rotationListSlides WHERE list_id=%d AND slide_id=%d AND order_num=%d",
+            $list_id, $slide_id, $order_num);
           
           if (stExecSQLCond($sql, "List slide refs deleted."))
           {
--- a/admin.php	Fri Dec 06 18:45:05 2013 +0200
+++ b/admin.php	Fri Dec 06 18:55:04 2013 +0200
@@ -605,9 +605,13 @@
     refreshRotationListEdit(list_id);
   }
 
-  var slide_id = jsGetValue("ctrlEDRotationListSel", 4);
-  if (slide_id > 0)
-    jsSendPOSTRequest("action=ctrl&type=moveRotationListSlide&list_id="+list_id+"&slide_id="+slide_id+"&dir="+dir, msuccess);
+  var slide = jsGetValue("ctrlEDRotationListSel", 4);
+  if (slide)
+  {
+    var str = slide.split("_");
+    jsSendPOSTRequest("action=ctrl&type=moveRotationListSlide&list_id="+list_id+
+      "&slide_id="+parseInt(str[0])+"&order_num="+parseInt(str[1])+"&dir="+dir, msuccess);
+  }
   else
     jsMessageBox("No slide selected?");
 }
@@ -628,16 +632,20 @@
 }
 
 
-function deleteRotationListSlide(list_id)
+function removeRotationListSlide(list_id)
 {
   var msuccess = function(txt)
   {
     refreshRotationListEdit(list_id);
   }
 
-  var slide_id = jsGetValue("ctrlEDRotationListSel", 4);
-  if (slide_id > 0)
-    jsSendPOSTRequest("action=ctrl&type=removeRotationListSlide&list_id="+list_id+"&slide_id="+slide_id, msuccess);
+  var slide = jsGetValue("ctrlEDRotationListSel", 4);
+  if (slide)
+  {
+    var str = slide.split("_");
+    jsSendPOSTRequest("action=ctrl&type=removeRotationListSlide&list_id="+list_id+
+      "&slide_id="+parseInt(str[0])+"&order_num="+parseInt(str[1]), msuccess);
+  }
   else
     jsMessageBox("No slide selected?");
 }