[xoops-svn] SF.net SVN: xoops-svn:[12622] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate

[<txm...@us...>]

Revision: 12622
          http://sourceforge.net/p/xoops/svn/12622
Author:   txmodxoops
Date:     2014-06-21 16:51:00 +0000 (Sat, 21 Jun 2014)
Log Message:
-----------
 - Updated
 - Now we can edit and update fields
 - Work in progress

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	2014-06-20 07:31:22 UTC (rev 12621)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	2014-06-21 16:51:00 UTC (rev 12622)
@@ -149,7 +149,7 @@
 		var_dump($field_mid);
 		var_dump($field_tid);
 		var_dump($field_numb);
-		var_dump($field_name);
+		var_dump($field_name);		
     break;	
 	
 	case 'save':
@@ -167,7 +167,7 @@
 				case 'new':
 					$fieldsObj =& $fields->create();					
 				break;
-				case 'edit':
+				default:					
 					$fieldsObj =& $fields->get($value);									
 				break;					
 			}            			
@@ -230,13 +230,14 @@
 		$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');
 		$adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list');           
 		$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());		
-		
-		$fieldsObj = $tdmcreate->getHandler('fields')->get( $field_tid );        		
+
+		/*$fieldsObj = $tdmcreate->getHandler('fields')->get( $field_tid );        		
 		$form = $fieldsObj->getForm(null, $field_tid);
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());		
+		$GLOBALS['xoopsTpl']->assign('form', $form->render());*/
+		$form = TDMCreate_getFieldsForm($field_mid, $field_tid);
+		$GLOBALS['xoopsTpl']->assign('form', $form->render());
 
 		var_dump($field_tid);
-		var_dump($field_numb);
 	break;
 
     case 'drag':        

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-06-20 07:31:22 UTC (rev 12621)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-06-21 16:51:00 UTC (rev 12622)
@@ -195,8 +195,7 @@
 							'table_comments' => (($_REQUEST['table_comments'] == 1) ? '1' : '0'), 
 							'table_notifications' => (($_REQUEST['table_notifications'] == 1) ? '1' : '0'),
 							'table_permissions' => (($_REQUEST['table_permissions'] == 1) ? '1' : '0')));        
-		//$session_table = TDMCreateSession::getInstance();
-		//$session_table->setSession('session_table_name', $_POST['table_name']);
+		//
 		if( $tdmcreate->getHandler('tables')->insert($obj) ) {	 
 			if( $obj->isNew() ) { 
 				$table_iid = $GLOBALS['xoopsDB']->getInsertId();
@@ -206,7 +205,7 @@
 				redirect_header('tables.php', 5, sprintf(_AM_TDMCREATE_TABLE_FORM_UPDATED_OK, $_POST['table_name']));
 			}
 		}
-		
+		//
 		$GLOBALS['xoopsTpl']->assign('error', $obj->getHtmlErrors());        
 		$form = $obj->getForm();
 		$GLOBALS['xoopsTpl']->assign('form', $form->render());

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-06-20 07:31:22 UTC (rev 12621)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-06-21 16:51:00 UTC (rev 12622)
@@ -90,22 +90,17 @@
 	/*
 	*  @public function getForm
 	*
-	*  @param integer $f_mid
+	*  @param integer $field_mid
 	*  @param integer $f_tid
 	*  @param integer $f_numb
 	*  @param string $f_name
 	*  @param mixed $action
 	*/
-	public function getForm($f_mid = null, $f_tid = null, $f_numb = null, $f_name = null, $action = false)
+	public function getForm($field_mid = null, $field_tid = null, $field_numb = null, $f_name = null, $action = false)
 	{
 		if ($action === false) {
 			$action = $_SERVER['REQUEST_URI'];
 		}
-		$isNew = $this->isNew();
-		$title = $isNew ? sprintf(_AM_TDMCREATE_FIELD_ADD) : sprintf(_AM_TDMCREATE_FIELD_EDIT);	
-
-		$field_mid = $isNew ? $f_mid : $this->getVar('field_mid');
-		$field_tid = $isNew ? $f_tid : $this->getVar('field_tid');
 		
 		$form = new TDMCreateThemeForm(null, 'form', $action, 'post', true);
 		$form->setExtra('enctype="multipart/form-data"');			
@@ -113,7 +108,7 @@
 		// New Object HtmlTable           
 		$form->addElement(new TDMCreateFormLabel('<table border="0" cellspacing="1" class="outer width100">'));
         $form->addElement(new TDMCreateFormLabel('<thead class="center">'));	
-		$form->addElement(new TDMCreateFormLabel('<tr class="head"><th colspan="9">'.$title.'</th></tr>'));
+		$form->addElement(new TDMCreateFormLabel('<tr class="head"><th colspan="9">'._AM_TDMCREATE_FIELD_ADD.'</th></tr>'));
 		$form->addElement(new TDMCreateFormLabel('<tr class="head width5">'));        		
 		$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_NUMBER.'</td>'));
 		$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_NAME.'</td>'));														
@@ -125,28 +120,120 @@
 		$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_KEY.'</th>'));
 		$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_PARAMETERS.'</th>'));	
 		$form->addElement(new TDMCreateFormLabel('</tr></thead>'));	
-		$form->addElement(new TDMCreateFormLabel('<tbody>'));		
+		$form->addElement(new TDMCreateFormLabel('<tbody>'));	
+		$table_autoincrement = $this->tdmcreate->getHandler('tables')->get($field_tid);
 		//
 		$class = 'even';
-		if($isNew) {
-			for($i = 1; $i <= $f_numb; $i++) {
-				$class = ($class == 'even') ? 'odd' : 'even';
-				$this->getFormElements($form, $isNew, 'new', $i, $f_name, $field_mid, $field_tid, $this, $class);	
+		for($i = 1; $i <= $field_numb; $i++) {
+			$class = ($class == 'even') ? 'odd' : 'even';
+			$form->addElement(new XoopsFormHidden('field_id['.$i.']', 'new'));	
+			$form->addElement(new XoopsFormHidden('field_mid', $field_mid));
+			$form->addElement(new XoopsFormHidden('field_tid', $field_tid));
+							
+			$form->addElement(new TDMCreateFormLabel('<tr class="'.$class.'">'));
+			// Index ID
+			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$i.'</td>'));
+			// Field Name
+			$this_field_name = (!empty($f_name) ? $f_name . '_' : '');
+			$field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$i.']', 15, 255, $this_field_name);			
+			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
+			// Field Type			
+			$fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$i.']');
+			$fieldtype_select->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList()); 
+			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$fieldtype_select->render().'</td>'));
+			// Field Value	
+			$value = ($i == 1) && ($table_autoincrement->getVar('table_autoincrement') == 1) ? '8' : '';
+			$field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value['.$i.']', 5, 20, $value);
+			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_value->render().'</td>'));
+			// Field Attributes						
+			$field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute['.$i.']');  
+			$field_attributes_select->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList());
+			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_attributes_select->render().'</td>'));
+			// Field Null			
+			$field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null['.$i.']');
+			$field_null_select->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList());			
+			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_null_select->render().'</td>'));
+			// Field Default
+			$field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default['.$i.']', 15, 25);
+			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_default->render().'</td>'));
+			// Field Key
+			$field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key['.$i.']');
+			$field_key_select->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList());
+			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_key_select->render().'</td>'));
+			// Field Void			
+			if( ($i == 1) && ($table_autoincrement->getVar('table_autoincrement') == 1)) {				
+				$form->addElement(new TDMCreateFormLabel('<td>&nbsp;</td></tr>'));
+			} else {			
+				// Box header row				
+				$parameters_tray = new XoopsFormElementTray('', '<br />');							
+				// Field Elements	
+				$criteria_element = new CriteriaCompo();				
+				$criteria_element->add(new Criteria('fieldelement_tid', 0));					
+				$criteria_table = new CriteriaCompo();	
+				$criteria_table->add(new Criteria('fieldelement_mid', $field_mid));			
+				$field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element['.$i.']');			    
+					$field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_element));
+					$field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_table));
+					unset($criteria_element); unset($criteria_table);					
+					$parameters_tray->addElement($field_elements_select);
+								
+				$field_parent = 0;
+					$check_field_parent = new XoopsFormCheckBox(' ', 'field_parent['.$i.']');
+					$check_field_parent->addOption($field_parent, _AM_TDMCREATE_FIELD_PARENT );
+					$parameters_tray->addElement($check_field_parent);
+					
+				$field_inlist = 0;
+					$check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist['.$i.']', $field_inlist);
+					$check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
+					$parameters_tray->addElement($check_field_inlist);
+				
+				$field_inform = 0;
+					$check_field_inform = new XoopsFormCheckBox(' ', 'field_inform['.$i.']', $field_inform);
+					$check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
+					$parameters_tray->addElement($check_field_inform);
+
+				$field_admin = 0;
+					$check_field_admin = new XoopsFormCheckBox(' ', 'field_admin['.$i.']', $field_admin);
+					$check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
+					$parameters_tray->addElement($check_field_admin);
+
+				$field_user = 0;
+					$check_field_user = new XoopsFormCheckBox(' ', 'field_user['.$i.']', $field_user);
+					$check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER);
+					$parameters_tray->addElement($check_field_user);
+
+				$field_block = 0;
+					$check_field_block = new XoopsFormCheckBox('', 'field_block['.$i.']', $field_block);
+					$check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
+					$parameters_tray->addElement($check_field_block);
+				
+				if(($i == 1) && ($table_autoincrement->getVar('table_autoincrement') == 1)) {
+					$field_main = 0;
+					$check_field_main = new XoopsFormRadio('', 'field_main['.$i.']', $field_main);
+					$check_field_main->addOption($field_main, _AM_TDMCREATE_FIELD_MAINFIELD );
+				} elseif(($i == 2) && ($table_autoincrement->getVar('table_autoincrement') == 1)) {
+				    $field_main = 1;
+					$check_field_main = new XoopsFormRadio('', 'field_main['.$i.']', $field_main);
+					$check_field_main->addOption($field_main, _AM_TDMCREATE_FIELD_MAINFIELD );
+				} else {
+				    $field_main = 0;
+					$check_field_main = new XoopsFormRadio('', 'field_main['.$i.']');
+					$check_field_main->addOption($field_main, _AM_TDMCREATE_FIELD_MAINFIELD );
+				}				
+				$parameters_tray->addElement($check_field_main);			
+				
+				$field_search = 0;
+					$check_field_search = new XoopsFormCheckBox(' ', 'field_search['.$i.']', $field_search);
+					$check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);	
+					$parameters_tray->addElement($check_field_search);					
+
+				$field_required = 0;
+					$check_field_required = new XoopsFormCheckBox(' ', 'field_required['.$i.']', $field_required);
+					$check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
+					$parameters_tray->addElement($check_field_required);
+				$form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">'._AM_TDMCREATE_FIELD_PARAMETERS_LIST.'</div><div class="portlet-content">'.$parameters_tray->render().'</div></div></td></tr>'));
 			}
-		} else {
-			// Get the list of fields
-			$criteria = new CriteriaCompo();
-			$criteria->add(new Criteria('field_tid', $field_tid));
-			$fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria);
-			unset($criteria);
-			$i = 1;
-			foreach($fields as $field)	{
-				$class = ($class == 'even') ? 'odd' : 'even';
-				$this->getFormElements($form, $isNew, 'edit', $i, null, $field_mid, $field_tid, $field, $class);
-				$i++;
-			}
-			unset($i);
-		}					
+		}						
 		// Send Form Data
 		$form->addElement(new TDMCreateFormLabel('</tbody>'));
 		$form->addElement(new TDMCreateFormLabel('<tfoot><tr>'));
@@ -156,125 +243,6 @@
 		$form->addElement(new TDMCreateFormLabel('<td>'.$form_button->render().'</td>'));
 		$form->addElement(new TDMCreateFormLabel('</tr></tfoot></table>'));
 		return $form;
-	}
-	
-	/*
-	*  @private function getFormElements
-	*
-	*  @param object $form
-	*  @param boolean $isNew
-	*  @param string $type
-	*  @param integer $id
-	*  @param string $f_name
-	*  @param string $field_mid
-	*  @param string $field_tid
-	*  @param object $field
-	*  @param string $class
-	*/
-	private function getFormElements($form, $isNew, $type, $id, $f_name = null, $field_mid, $field_tid, $field, $class = 'even')
-	{
-		$form->addElement(new XoopsFormHidden('field_id['.$id.']', $type));	
-		$form->addElement(new XoopsFormHidden('field_mid', $field_mid));
-		$form->addElement(new XoopsFormHidden('field_tid', $field_tid));
-            			
-		$form->addElement(new TDMCreateFormLabel('<tr class="'.$class.'">'));
-		// Index ID
-		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$id.'</td>'));
-		// Field Name
-		$this_field_name = $isNew ? (!empty($f_name) ? $f_name . '_' : '') : $field->getVar('field_name');
-		$field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$id.']', 15, 255, $this_field_name);			
-		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
-		// Field Type			
-		$fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$id.']', $field->getVar('field_type'));
-		$fieldtype_select->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList()); 
-		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$fieldtype_select->render().'</td>'));
-		// Field Value			
-		$field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value['.$id.']', 5, 20, $field->getVar('field_value'));
-		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_value->render().'</td>'));
-		// Field Attributes						
-		$field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute['.$id.']', $field->getVar('field_attribute'));  
-		$field_attributes_select->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList());
-		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_attributes_select->render().'</td>'));
-		// Field Null			
-		$field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null['.$id.']', $field->getVar('field_null'));
-		$field_null_select->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList());			
-		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_null_select->render().'</td>'));
-		// Field Default
-		$field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default['.$id.']', 15, 25, $field->getVar('field_default'));
-		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_default->render().'</td>'));
-		// Field Key
-		$field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key['.$id.']', $field->getVar('field_key'));
-		$field_key_select->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList());
-		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_key_select->render().'</td>'));
-		// Field Void
-		$table_autoincrement = $this->tdmcreate->getHandler('tables')->get($field_tid);
-		if( ($id == 1) && ($table_autoincrement->getVar('table_autoincrement') == 1)) {				
-			$form->addElement(new TDMCreateFormLabel('<td>&nbsp;</td></tr>'));
-		} else {			
-			// Box header row				
-			$parameters_tray = new XoopsFormElementTray('', '<br />');							
-			// Field Elements	
-			$criteria_element = new CriteriaCompo();				
-			$criteria_element->add(new Criteria('fieldelement_tid', 0));					
-			$criteria_table = new CriteriaCompo();	
-			$criteria_table->add(new Criteria('fieldelement_mid', $field_mid));			
-			$field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element['.$id.']', $field->getVar('field_element'));			    
-				$field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_element));
-				$field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_table));
-				unset($criteria_element); unset($criteria_table);					
-				$parameters_tray->addElement($field_elements_select);
-							
-			$field_parent = $isNew ? 0 : $field->getVar('field_parent');
-				$check_field_parent = new XoopsFormCheckBox(' ', 'field_parent['.$id.']');
-				$check_field_parent->addOption($field_parent, _AM_TDMCREATE_FIELD_PARENT );
-				$parameters_tray->addElement($check_field_parent);
-				
-			$field_inlist = $isNew ? 0 : $field->getVar('field_inlist');
-				$check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist['.$id.']', $field_inlist);
-				$check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
-				$parameters_tray->addElement($check_field_inlist);
-			
-			$field_inform = $isNew ? 0 : $field->getVar('field_inform');
-				$check_field_inform = new XoopsFormCheckBox(' ', 'field_inform['.$id.']', $field_inform);
-				$check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
-				$parameters_tray->addElement($check_field_inform);
-
-			$field_admin = $isNew ? 0 : $field->getVar('field_admin');
-				$check_field_admin = new XoopsFormCheckBox(' ', 'field_admin['.$id.']', $field_admin);
-				$check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
-				$parameters_tray->addElement($check_field_admin);
-
-			$field_user = $isNew ? 0 : $field->getVar('field_user');
-				$check_field_user = new XoopsFormCheckBox(' ', 'field_user['.$id.']', $field_user);
-				$check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER);
-				$parameters_tray->addElement($check_field_user);
-
-			$field_block = $isNew ? 0 : $field->getVar('field_block');
-				$check_field_block = new XoopsFormCheckBox('', 'field_block['.$id.']', $field_block);
-				$check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
-				$parameters_tray->addElement($check_field_block);
-			
-			$main = $field->getVar('field_main'); 
-			$field_main = $isNew ? $id : $main;
-				if($main == 1) {
-					$check_field_main = new XoopsFormRadio('', 'field_main['.$id.']', $field_main);
-				} else {
-					$check_field_main = new XoopsFormRadio('', 'field_main['.$id.']');
-				}
-				$check_field_main->addOption($field_main, _AM_TDMCREATE_FIELD_MAINFIELD );
-				$parameters_tray->addElement($check_field_main);			
-			
-			$field_search = $isNew ? 0 : $field->getVar('field_search');
-				$check_field_search = new XoopsFormCheckBox(' ', 'field_search['.$id.']', $field_search);
-				$check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);	
-				$parameters_tray->addElement($check_field_search);					
-
-			$field_required = $isNew ? 0 : $field->getVar('field_required');
-				$check_field_required = new XoopsFormCheckBox(' ', 'field_required['.$id.']', $field_required);
-				$check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
-				$parameters_tray->addElement($check_field_required);
-			$form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">'._AM_TDMCREATE_FIELD_PARAMETERS_LIST.'</div><div class="portlet-content">'.$parameters_tray->render().'</div></div></td></tr>'));
-		}			
 	}		
 }
 /*
@@ -289,7 +257,7 @@
 	*/
 	public function __construct(&$db) 
 	{		
-		parent::__construct($db, 'mod_tdmcreate_fields', 'tdmcreatefields', 'field_tid', 'field_name');
+		parent::__construct($db, 'mod_tdmcreate_fields', 'tdmcreatefields', 'field_id', 'field_name');
 	}
 	
 	/**
@@ -305,13 +273,13 @@
     /**
      * retrieve a field
      *
-     * @param int $id field id
+     * @param int $i field id
      *
      * @return mixed reference to the {@link TDMCreateFields} object
      */
-    public function &get($id = null, $fields = null)
+    public function &get($i = null, $fields = null)
     {        
-		return parent::get($id, $fields);
+		return parent::get($i, $fields);
     }	
 
 	/**

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php	2014-06-20 07:31:22 UTC (rev 12621)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php	2014-06-21 16:51:00 UTC (rev 12622)
@@ -129,4 +129,156 @@
 function phpFunction($val='')
 {      // create php function here
 	echo $val;
-}*/
\ No newline at end of file
+}*/
+
+/*
+*  @function getFieldsForm
+*
+*  @param integer $field_mid
+*  @param integer $field_tid
+*  @param mixed $action
+*/
+function TDMCreate_getFieldsForm($field_mid = null, $field_tid = null, $action = false)
+{
+	if ($action === false) {
+		$action = $_SERVER['REQUEST_URI'];
+	}
+	$tdmcreate = TDMCreate::getInstance();
+
+	require_once TDMC_PATH . '/class/html/simplelabel.php';
+	require_once TDMC_PATH . '/class/form/themeform.php';
+	$form = new TDMCreateThemeForm(null, 'form', $action, 'post', true);
+	$form->setExtra('enctype="multipart/form-data"');			
+					
+	// New Object HtmlTable           
+	$form->addElement(new TDMCreateFormLabel('<table border="0" cellspacing="1" class="outer width100">'));
+	$form->addElement(new TDMCreateFormLabel('<thead class="center">'));	
+	$form->addElement(new TDMCreateFormLabel('<tr class="head"><th colspan="9">'._AM_TDMCREATE_FIELD_EDIT.'</th></tr>'));
+	$form->addElement(new TDMCreateFormLabel('<tr class="head width5">'));        		
+	$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_NUMBER.'</td>'));
+	$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_NAME.'</td>'));														
+	$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_TYPE.'</td>'));
+	$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_VALUE.'</th>'));
+	$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_ATTRIBUTE.'</th>'));
+	$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_NULL.'</th>'));
+	$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_DEFAULT.'</th>'));
+	$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_KEY.'</th>'));
+	$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_PARAMETERS.'</th>'));	
+	$form->addElement(new TDMCreateFormLabel('</tr></thead>'));	
+	$form->addElement(new TDMCreateFormLabel('<tbody>'));		
+	//
+	$class = 'even';	
+	// Get the list of fields
+	$criteria = new CriteriaCompo();
+	$criteria->add(new Criteria('field_tid', $field_tid));
+	$fields = $tdmcreate->getHandler('fields')->getObjects($criteria);
+	unset($criteria);
+	$id = 1;
+	foreach($fields as $field)	{
+		$class = ($class == 'even') ? 'odd' : 'even';
+		$field_id = $field->getVar('field_id');
+		$form->addElement(new XoopsFormHidden('field_id['.$field_id.']', $field_id));	
+		$form->addElement(new XoopsFormHidden('field_mid', $field_mid));
+		$form->addElement(new XoopsFormHidden('field_tid', $field_tid));
+						
+		$form->addElement(new TDMCreateFormLabel('<tr class="'.$class.'">'));
+		// Index ID
+		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$id.'</td>'));	
+		// Field Name
+		$field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$field_id.']', 15, 255, $field->getVar('field_name'));			
+		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
+		// Field Type			
+		$fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$field_id.']', $field->getVar('field_type'));
+		$fieldtype_select->addOptionArray($tdmcreate->getHandler('fieldtype')->getList()); 
+		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$fieldtype_select->render().'</td>'));
+		// Field Value			
+		$field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value['.$field_id.']', 5, 20, $field->getVar('field_value'));
+		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_value->render().'</td>'));
+		// Field Attributes						
+		$field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute['.$field_id.']', $field->getVar('field_attribute'));  
+		$field_attributes_select->addOptionArray($tdmcreate->getHandler('fieldattributes')->getList());
+		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_attributes_select->render().'</td>'));
+		// Field Null			
+		$field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null['.$field_id.']', $field->getVar('field_null'));
+		$field_null_select->addOptionArray($tdmcreate->getHandler('fieldnull')->getList());			
+		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_null_select->render().'</td>'));
+		// Field Default
+		$field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default['.$field_id.']', 15, 25, $field->getVar('field_default'));
+		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_default->render().'</td>'));
+		// Field Key
+		$field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key['.$field_id.']', $field->getVar('field_key'));
+		$field_key_select->addOptionArray($tdmcreate->getHandler('fieldkey')->getList());
+		$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_key_select->render().'</td>'));
+		// Field Void
+		$table_autoincrement = $tdmcreate->getHandler('tables')->get($field_tid);
+		if( ($id == 1) && ($table_autoincrement->getVar('table_autoincrement') == 1)) {				
+			$form->addElement(new TDMCreateFormLabel('<td>&nbsp;</td></tr>'));
+		} else {			
+			// Box header row				
+			$parameters_tray = new XoopsFormElementTray('', '<br />');							
+			// Field Elements	
+			$criteria_element = new CriteriaCompo();				
+			$criteria_element->add(new Criteria('fieldelement_tid', 0));					
+			$criteria_table = new CriteriaCompo();	
+			$criteria_table->add(new Criteria('fieldelement_mid', $field_mid));			
+			$field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element['.$field_id.']', $field->getVar('field_element'));			    
+			$field_elements_select->addOptionArray($tdmcreate->getHandler('fieldelements')->getList($criteria_element));
+			$field_elements_select->addOptionArray($tdmcreate->getHandler('fieldelements')->getList($criteria_table));
+			unset($criteria_element); unset($criteria_table);					
+			$parameters_tray->addElement($field_elements_select);
+						
+			$check_field_parent = new XoopsFormCheckBox(' ', 'field_parent['.$field_id.']', $field->getVar('field_parent'));
+			$check_field_parent->addOption(1, _AM_TDMCREATE_FIELD_PARENT );
+			$parameters_tray->addElement($check_field_parent);
+			
+			$check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist['.$field_id.']', $field->getVar('field_inlist'));
+			$check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
+			$parameters_tray->addElement($check_field_inlist);
+		
+			$check_field_inform = new XoopsFormCheckBox(' ', 'field_inform['.$field_id.']', $field->getVar('field_inform'));
+			$check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
+			$parameters_tray->addElement($check_field_inform);
+
+			$check_field_admin = new XoopsFormCheckBox(' ', 'field_admin['.$field_id.']', $field->getVar('field_admin'));
+			$check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
+			$parameters_tray->addElement($check_field_admin);
+
+			$check_field_user = new XoopsFormCheckBox(' ', 'field_user['.$field_id.']', $field->getVar('field_user'));
+			$check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER);
+			$parameters_tray->addElement($check_field_user);
+
+			$check_field_block = new XoopsFormCheckBox('', 'field_block['.$field_id.']', $field->getVar('field_block'));
+			$check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
+			$parameters_tray->addElement($check_field_block);
+			
+			$field_main = $field->getVar('field_main'); 
+			if($field_main == 1) {
+				$check_field_main = new XoopsFormRadio('', 'field_main['.$field_id.']', $field_main);
+			} else {
+				$check_field_main = new XoopsFormRadio('', 'field_main['.$field_id.']');
+			}
+			$check_field_main->addOption($field_main, _AM_TDMCREATE_FIELD_MAINFIELD );
+			$parameters_tray->addElement($check_field_main);			
+			
+			$check_field_search = new XoopsFormCheckBox(' ', 'field_search['.$field_id.']', $field->getVar('field_search'));
+			$check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);
+			$parameters_tray->addElement($check_field_search);			
+
+			$check_field_required = new XoopsFormCheckBox(' ', 'field_required['.$field_id.']', $field->getVar('field_required'));
+			$check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
+			$parameters_tray->addElement($check_field_required);
+			$form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">'._AM_TDMCREATE_FIELD_PARAMETERS_LIST.'</div><div class="portlet-content">'.$parameters_tray->render().'</div></div></td></tr>'));
+		}
+		$id++;		
+	}	
+	unset($id);
+	// Send Form Data
+	$form->addElement(new TDMCreateFormLabel('</tbody>'));
+	$form->addElement(new TDMCreateFormLabel('<tfoot><tr>'));
+	$form_hidden = new XoopsFormHidden('op', 'save');
+	$form_button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+	$form->addElement(new TDMCreateFormLabel('<td colspan="8">'.$form_hidden->render().'</td>'));
+	$form->addElement(new TDMCreateFormLabel('<td>'.$form_button->render().'</td>'));
+	$form->addElement(new TDMCreateFormLabel('</tr></tfoot></table>'));
+	return $form;
+}
\ No newline at end of file