Ticket #349: catwalk-js-multiple-joins-pages.diff

turbogears/toolbox/catwalk/static/javascript/catwalk.js

@@ -336 +335 @@
-               next_page
-              );
-}
+catwalk.paging_join_footer = function(result)
+{
+    var total = parseInt(result['total']);
+    var start = parseInt(result['start']);
+    var size = parseInt(result['page_size']);
+    if(total <= size ) return '';
+    var page_number = parseInt( start / size + 1 );
+    var total_pages =  parseInt( total/size +1);
+    var previous_page = IMG({'border':'0','style':'margin-right:5px','align':'absbottom',
+                                'src':'/tg_static/images/transp.png'} );
+    var next_page = previous_page;
+    var next_start = start + size;
+    var previous_start = start - size;
+    if(page_number > 1)
+    {
+        previous_page = A({
+                           'href':"javascript:catwalk.retrieveJoins('"+ result['objectName'] +"','" + result['id'] + "','" + result['joinName'] + "','" + result['joinType'] + "','" + result['joinObjectName'] + "','" + previous_start +"')",
+                           'title':'Previous page',
+                           'class':'discloser'
+                           },
+                           IMG({'border':'0','width':'15','style':'margin-right:5px','align':'absbottom',
+                                'src':'/tg_static/images/arrow_left.png'} )
+                          );
+    }
+    if(page_number < total_pages)
+    {
+        next_page = A({
+                           'href':"javascript:catwalk.retrieveJoins('"+ result['objectName'] +"','" + result['id'] + "','" + result['joinName'] + "','" + result['joinType'] + "','" + result['joinObjectName'] + "','" + next_start +"')",
+                           'title':'Next page',
+                           'class':'discloser'
+                           },
+                           IMG({'border':'0','style':'margin-right:5px','align':'absbottom',
+                                'src':'/tg_static/images/arrow_up.png'} )
+                          );
+    }
+    return DIV({'style':'font-size:10px;margin:6px;'},
+               previous_page,
+               ' ',
+               'Page ',
+               catwalk.join_page_selector(page_number,total_pages,size,result['objectName'], result['id'], result['joinName'], result['joinType'], result['joinObjectName']) ,
+               '  of '+ total_pages,
+               ' ',
+               next_page
+              );
+}
-catwalk.page_size = function(size,object_name)
-{
-    var page_size =  createDOM('SELECT',{'style':'font-size:10px',
@@ -361 +405 @@
-    }
-    return page_selector;
-}
+catwalk.join_page_selector = function(page_number,total_pages,size,object_name, id, joinName, joinType, joinObjectName)
+{
+    var page_selector =  createDOM('SELECT',{'style':'font-size:10px',
+                                             'onchange':'catwalk.update_join_page(this,"'+ object_name + '","' + id + '","' + joinName + '","' + joinType + '","' + joinObjectName+ '")'});
+    for(var i=0;i < total_pages;i++)
+    {
+        var props ={'value':(i*size)};
+        if((i+1) == page_number) props['selected'] ='selected';
+        page_selector.appendChild(createDOM('OPTION',props,(i+1)));
+    }
+    return page_selector;
+}
-catwalk.update_page_size = function(list,object_name)
-{
-    return;
@@ -370 +426 @@
-    var page = list.options[list.selectedIndex].value;
-    catwalk.retrieveValues(object_name,page);
-}
-go_to_page = function(page
+update_join_page = function( list, object_name, id, joinName, joinType, joinObjectName 
-{
-
+
+
-}
-catwalk.renderValues = function(result)
-{
@@ -699 +756 @@
-                              ctx['id'],
-                              ctx['joinName'],
-                              ctx['joinType'],
-
+
+
-    }
-}
-catwalk.retrieveManageRelatedJoins = function(objectName,id,joinName,relatedObjectName)
@@ -734 +792 @@
-  var allJoins = createDOM('SELECT',{'id':'select_add_'+ results['join'],'size':'10','style':'width:225px','multiple':'multiple'},
-                                map(catwalk.renderOptions, catwalk.optionsForJoins(results['allJoins']['rows']) ) 
-                           );
-
+,0
-  var joinsTable = TABLE(null,
-                         TBODY(null,
-                               TR(null,
@@ -787 +845 @@
-{
-    catwalk.disclosedRelations[joinName]['visible'] = !catwalk.disclosedRelations[joinName]['visible'];
-}
-
+, page
-{
-  var u = 'joins?objectName='+ objectName +'&id='+ id;
-  u+='&join='+ joinName +'&joinType='+ joinType +'&joinObjectName='+ joinObjectName;
+  u += '&start=' + page;
-  catwalk.addDisclosedRelation(joinName,{'objectName':objectName,
-                                         'visible':true,
-                                         'id':id,
@@ -846 +905 @@
-  else
-  {
-    //grid = DIV(null,grid,catwalk.renderAddMultipleJoinsControl(r['joinObjectName']));
-
+
+
-  }
-  replaceChildNodes('grid_'+ results['join'],grid);
-
@@ -897 +957 @@
-  {
-    var edit = '';
-    var action = Widget.renderHandler('javascript:catwalk.retrieveJoins',
-
+,0
-                                     );
-    return TR(null, TD({'colspan':'2'},
-                        SPAN({'id':'disclose_'+ column.columnName},