[geeklog-cvs] Geeklog-2.x/views BaseViewFlexy.php, 1.1, 1.2 BaseViewFlexyPlugin.php, 1.1, 1.2 Geeklog_CatalogMaintenanceView.php, 1.5, NONE Geeklog_showErrorView.php, 1.5, NONE

[Tony Bibbs]

Update of /cvsroot/geeklog2/Geeklog-2.x/views
In directory qs1489.pair.com:/tmp/cvs-serv11020

Modified Files:
	BaseViewFlexy.php BaseViewFlexyPlugin.php 
Removed Files:
	Geeklog_CatalogMaintenanceView.php Geeklog_showErrorView.php 
Log Message:
Files no longer needed


--- Geeklog_CatalogMaintenanceView.php DELETED ---

--- Geeklog_showErrorView.php DELETED ---

Index: BaseViewFlexy.php
===================================================================
RCS file: /cvsroot/geeklog2/Geeklog-2.x/views/BaseViewFlexy.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BaseViewFlexy.php	29 Jun 2007 16:51:38 -0000	1.1
--- BaseViewFlexy.php	8 Aug 2007 19:00:10 -0000	1.2
***************
*** 350,355 ****
      public function getSecurityEditorForm()
      {
!     	$this->getDropDown('getSecurityGroup','securityGroupList',array(),'','groupId','groupName', '-- SELECT GROUP --');    	
          $this->flexyHandle->compile('SecurityEditorForm.thtml');
          $this->flexyHandle->outputObject($this, $this->flexyElements);
      }
--- 350,356 ----
      public function getSecurityEditorForm()
      {
!     	$this->getDropDown('getSecurityGroup','group',array(),'','groupId','groupName', '-- SELECT GROUP --');    	
          $this->flexyHandle->compile('SecurityEditorForm.thtml');
+         //$this->flexyElements = $this->flexyHandle->getElements();
          $this->flexyHandle->outputObject($this, $this->flexyElements);
      }
***************
*** 877,880 ****
--- 878,898 ----
              }
  	    }
+     }
+     
+     /**
+      * Flexy helper function to expose the form elements for us
+      *
+      * Use this instead of compile() on the flexyHandle member because this will make the form
+      * elements available to the view's flexyElements member.  THis prevent us from having to
+      * explicitly call the Flexy Element's constructor.
+      * 
+      * @access protected
+      * @param string $flexyTemplate Flexy template file to compile
+      * 
+      */
+     protected function compile($flexyTemplate)
+     {
+     	$this->flexyHandle->compile($flexyTemplate);
+     	$this->flexyElements = $this->flexyHandle->getElements();
      }
  }

Index: BaseViewFlexyPlugin.php
===================================================================
RCS file: /cvsroot/geeklog2/Geeklog-2.x/views/BaseViewFlexyPlugin.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BaseViewFlexyPlugin.php	29 Jun 2007 16:51:38 -0000	1.1
--- BaseViewFlexyPlugin.php	8 Aug 2007 19:00:10 -0000	1.2
***************
*** 298,303 ****
          
          // Add default ACL entries for any groups
!         $dao = Geeklog_DAO::singleton();
          $groupAcls = $dao->find('getDefaultACLById', array($this->pluginId));
          foreach ($groupAcls as $curDefaultAcl) {
              $acl = new Gl2ItemAcl(); 
--- 298,304 ----
          
          // Add default ACL entries for any groups
!         $dao = Geeklog_DAO_DAOFactory::getDAO();
          $groupAcls = $dao->find('getDefaultACLById', array($this->pluginId));
+         if (!is_array($groupAcls)) $groupAcls = array();
          foreach ($groupAcls as $curDefaultAcl) {
              $acl = new Gl2ItemAcl();