[Openinteract-commits] CVS: OpenInteract/pkg/base_page/OpenInteract/Handler Page.pm,1.12,1.13

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler
In directory usw-pr-cvs1:/tmp/cvs-serv15764/OpenInteract/Handler

Modified Files:
	Page.pm 
Log Message:
add the 'storage' and 'content_location' fields to be edited, other related changes


Index: Page.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler/Page.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Page.pm	2001/11/26 13:44:31	1.12
--- Page.pm	2001/11/27 12:08:36	1.13
***************
*** 41,46 ****
  sub MY_EDIT_DISPLAY_TASK       { return 'show' }
  sub MY_EDIT_FIELDS             { return qw( location title author keywords
!                                             boxes main_template notes content ) }
! sub MY_EDIT_FIELDS_TOGGLED     { return qw( is_active is_file template_parse ) }
  sub MY_EDIT_FIELDS_DATE        { return qw( active_on expires_on ) }
  sub MY_ALLOW_SEARCH_FORM       { return 1 }
--- 41,47 ----
  sub MY_EDIT_DISPLAY_TASK       { return 'show' }
  sub MY_EDIT_FIELDS             { return qw( location title author keywords
!                                             boxes main_template notes content
!                                             storage content_location ) }
! sub MY_EDIT_FIELDS_TOGGLED     { return qw( is_active template_parse ) }
  sub MY_EDIT_FIELDS_DATE        { return qw( active_on expires_on ) }
  sub MY_ALLOW_SEARCH_FORM       { return 1 }
***************
*** 220,225 ****
          # mark it as non-editable to the form
  
          if ( $class->_is_displayable( $page->{mime_type} ) ) {
!             $page->content;
          }
          else {
--- 221,227 ----
          # mark it as non-editable to the form
  
+         $page->{storage} ||= 'file';
          if ( $class->_is_displayable( $page->{mime_type} ) ) {
!             $page->fetch_content;
          }
          else {
***************
*** 227,231 ****
          }
          $R->DEBUG && $R->scrib( 1, "This page should be in an editable form" );
-         $page->{is_file} ||= 'yes' if ( $page->CONFIG->{default_storage} eq 'file' );
          $params->{page} = $page;
          $R->{page}{title}   = 'Edit a Document';
--- 229,232 ----
***************
*** 258,262 ****
      }
  
!     $page->content;
  
      # Otherwise, ensure the page is active, set metadata and send it
--- 259,263 ----
      }
  
!     $page->fetch_content;
  
      # Otherwise, ensure the page is active, set metadata and send it