Mercurial > hg > fapweb

changeset 459:36835ef53346

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moar!
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 06 Dec 2013 18:38:57 +0200
parents cf591bb4c93c
children 7d732915dce9
files admajax.php admin.php msite.inc.php
diffstat 3 files changed, 42 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/admajax.php	Fri Dec 06 18:24:02 2013 +0200
+++ b/admajax.php	Fri Dec 06 18:38:57 2013 +0200
@@ -262,7 +262,6 @@
     "SELECT rotationListData.*, ".
     "(SELECT COUNT(*) FROM rotationListSlides WHERE list_id=rotationListData.id) AS nslides ".
     "FROM rotationListData ".
-    "LEFT JOIN rotationListSlides ON rotationListData.id=rotationListSlides.list_id ".
     "ORDER BY id DESC";
 
   $str = stGetOptionListStart("ctrlRotationLists", $indent, $outer);
@@ -785,12 +784,15 @@
             stChkRequestItem("slide_id", $slide_id, array(CHK_TYPE, VT_INT, "Invalid data.")))
         {
           $nslides = stFetchSQLColumn(stPrepareSQL("SELECT COUNT(*) FROM rotationListSlides WHERE list_id=%d", $list_id));
-          $sql = stPrepareSQL("INSERT INTO rotationListSlides () VALUES ()",
+          $sql = stPrepareSQL(
+            "INSERT INTO rotationListSlides (list_id,slide_id,order_num) VALUES (%d,%d,%d)",
             $list_id, $slide_id, $nslides+1);
 
-          stExecSQLCond($sql, "Slide added to list.");
-          stNormalizeListSlideOrder($list_id);
-          stDisplayUpdated();
+          if (stExecSQLCond($sql, "Slide added to list."))
+          {
+            stNormalizeListSlideOrder($list_id);
+            stDisplayUpdated();
+          }
         }
         break;
 
@@ -800,9 +802,12 @@
         {
           $sql = stPrepareSQL("DELETE FROM rotationListSlides WHERE list_id=%d AND slide_id=%d",
             $list_id, $slide_id);
-          stExecSQLCond($sql, "List slide refs deleted.");
-          stNormalizeListSlideOrder($list_id);
-          stDisplayUpdated();
+          
+          if (stExecSQLCond($sql, "List slide refs deleted."))
+          {
+            stNormalizeListSlideOrder($list_id);
+            stDisplayUpdated();
+          }
         }
         break;
     }
@@ -832,7 +837,7 @@
 
       case "infoRotationListEdit":
         if (stChkRequestItem("id", $list_id, array(CHK_TYPE, VT_INT, "Invalid data.")))
-          echo stGetInfoRotationListEditFull("", TRUE, $list_id);
+          echo stGetInfoRotationListEditFull("", stGetRequestItem("full", TRUE), $list_id);
         break;
 
       case "infoRotationListEditData":
@@ -842,7 +847,7 @@
 
       case "infoDisplaySlideEdit":
         if (stChkRequestItem("id", $slide_id, array(CHK_TYPE, VT_INT, "Invalid data.")))
-          echo stGetInfoDisplaySlideEdit("", TRUE, $slide_id);
+          echo stGetInfoDisplaySlideEdit("", FALSE, $slide_id);
         break;
 
       case "infoActiveRotationList":
--- a/admin.php	Fri Dec 06 18:24:02 2013 +0200
+++ b/admin.php	Fri Dec 06 18:38:57 2013 +0200
@@ -562,9 +562,9 @@
 //
 // Rotation list editing and handling
 //
-function refreshRotationListEdit()
+function refreshRotationListEdit(id)
 {
-  jsRefreshItems("ctrlRotationListEdit", "infoRotationListEdit", "");
+  jsRefreshItems("ctrlRotationListEdit", "infoRotationListEdit", "&id="+id+"&full=0");
 }
 
 
@@ -600,22 +600,29 @@
 
 function moveRotationListSlide(list_id, dir)
 {
-/*
-  var slide_id = jsGetValue("ctrlED", 4);
+  var msuccess = function(txt)
+  {
+    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, refreshRotationListEdit);
+    jsSendPOSTRequest("action=ctrl&type=moveRotationListSlide&list_id="+list_id+"&slide_id="+slide_id+"&dir="+dir, msuccess);
   else
     jsMessageBox("No slide selected?");
-  }
-*/
 }
 
 
 function addRotationListSlide(list_id)
 {
-  var slide_id = jsGetValue("ctrlEDDisplaySlides", 4);
+  var msuccess = function(txt)
+  {
+    refreshRotationListEdit(list_id);
+  }
+
+  var slide_id = jsGetValue("ctrlEDDisplaySlidesSel", 4);
   if (slide_id > 0)
-    jsSendPOSTRequest("action=ctrl&type=addRotationListSlide&list_id="+list_id+"&slide_id="+slide_id, refreshRotationListEdit);
+    jsSendPOSTRequest("action=ctrl&type=addRotationListSlide&list_id="+list_id+"&slide_id="+slide_id, msuccess);
   else
     jsMessageBox("No slide selected?");
 }
@@ -623,13 +630,16 @@
 
 function deleteRotationListSlide(list_id)
 {
-/*
-  var slide_id = jsGetValue("ctrlED", 4);
+  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, refreshRotationListEdit);
+    jsSendPOSTRequest("action=ctrl&type=removeRotationListSlide&list_id="+list_id+"&slide_id="+slide_id, msuccess);
   else
     jsMessageBox("No slide selected?");
-*/
 }
 
 
--- a/msite.inc.php	Fri Dec 06 18:24:02 2013 +0200
+++ b/msite.inc.php	Fri Dec 06 18:38:57 2013 +0200
@@ -295,4 +295,8 @@
 }
 
 
+function stNormalizeListSlideOrder($list_id)
+{
+}
+
 ?>
\ No newline at end of file