Implement EZP-23263: Allow setting section & state during creation of…

… new object
ezsystems · Aug 15, 2014 · ef7ebdb · ef7ebdb
1 parent c99d47a
commit ef7ebdb
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/design/admin/templates/content/edit_menu.tpl b/design/admin/templates/content/edit_menu.tpl
@@ -77,3 +77,14 @@
 </div>
 
 <!-- Translation box end-->
+
+{* Edit section *}
+<div class="sections">
+{include uri='design:content/parts/edit_sections.tpl'}
+</div>
+
+
+{* Edit states *}
+<div class="states">
+{include uri='design:content/parts/edit_states.tpl'}
+</div>
diff --git a/design/admin/templates/content/parts/edit_sections.tpl b/design/admin/templates/content/parts/edit_sections.tpl
@@ -1,7 +1,5 @@
 {* DO NOT EDIT THIS FILE! Use an override template instead. *}
 
-{* This file is normally not required anymore but is kept for backward compatibility reason! *}
-
 {* DESIGN: Header START *}<div class="box-header"><div class="box-ml">
 
 {* get the sections list which consist of: sections allowed to assign to the object by the
@@ -27,7 +25,7 @@
 {* show the section selector *}
 <div class="block">
     <label for="SelectedSectionId">{'Choose section'|i18n( 'design/admin/node/view/full' )}:</label>
-    <select id="SelectedSectionId" name="SelectedSectionId">
+    <select id="SelectedSectionId" name="SelectedSectionId"{if $object_is_draft|not()} disabled="disabled"{/if}>
     {foreach $sections as $section}
         {if eq( $section.id, $object.section_id )}
         <option value="{$section.id}" selected="selected">{$section.name|wash}</option>
@@ -39,7 +37,11 @@
 </div>
 
 <div class="block">
-<input type="submit" value="{'Set'|i18n( 'design/admin/node/view/full' )}" name="SectionEditButton" class="button" />
+{if $object_is_draft}
+    <input type="submit" value="{'Set'|i18n( 'design/admin/node/view/full' )}" name="SectionEditButton" class="button" />
+{else}
+    <input type="submit" value="{'Set'|i18n( 'design/admin/node/view/full' )}" name="SectionEditButton" class="button-disabled" disabled="disabled" />
+{/if}
 </div>
 {* DESIGN: Content END *}</div></div></div>
 

diff --git a/design/admin/templates/content/parts/edit_states.tpl b/design/admin/templates/content/parts/edit_states.tpl
@@ -1,7 +1,5 @@
 {* DO NOT EDIT THIS FILE! Use an override template instead. *}
 
-{* This file is normally not required anymore but is kept for backward compatibility reason! *}
-
 {def $enable_StateEditButton = false()}
 
 {* DESIGN: Header START *}<div class="box-header"><div class="box-ml">
@@ -16,7 +14,7 @@
 {foreach $object.allowed_assign_state_list as $allowed_assign_state_info}
 <div class="block">
     <label for="SelectedStateIDList">{$allowed_assign_state_info.group.current_translation.name|wash}</label>
-    <select id="SelectedStateIDList" name="SelectedStateIDList[]" {if $allowed_assign_state_info.states|count|eq(1)}disabled="disabled"{/if}>
+    <select id="SelectedStateIDList" name="SelectedStateIDList[]"{if or( $allowed_assign_state_info.states|count|eq(1), $object_is_draft|not() )} disabled="disabled"{/if}>
     {if $allowed_assign_state_info.states}
         {set $enable_StateEditButton = true()}
     {/if}
@@ -29,10 +27,10 @@
 
 
 <div class="block">
-{if $enable_StateEditButton}
+{if and( $enable_StateEditButton, $object_is_draft )}
     <input type="submit" value="{'Set'|i18n( 'design/admin/node/view/full' )}" name="StateEditButton" class="button" />
 {else}
-    <input type="submit" value="{'Set'|i18n( 'design/admin/node/view/full' )}" name="StateEditButton" class="button-disabled" />
+    <input type="submit" value="{'Set'|i18n( 'design/admin/node/view/full' )}" name="StateEditButton" class="button-disabled" disabled="disabled" />
 {/if}
 </div>
 </div></div></div></div></div></div>

diff --git a/kernel/content/attribute_edit.php b/kernel/content/attribute_edit.php
@@ -492,13 +492,13 @@
 $tpl->setVariable( 'object', $object );
 $tpl->setVariable( 'attribute_base', $attributeDataBaseName );
 
-$locationUIEnabled = true;
+$objectIsDraft = $object->attribute( 'status' ) == eZContentObject::STATUS_DRAFT;
+
 // If the object has been published we disable the location UI
-if ( $object->attribute( 'status' ) != eZContentObject::STATUS_DRAFT )
-{
-    $locationUIEnabled = false;
-}
-$tpl->setVariable( "location_ui_enabled", $locationUIEnabled );
+$tpl->setVariable( "location_ui_enabled", $objectIsDraft );
+
+// Give templates easy access to check if object is draft
+$tpl->setVariable( "object_is_draft", $objectIsDraft );
 
 
 if ( $Module->runHooks( 'pre_template', array( $class, $object, $version, $contentObjectAttributes, $EditVersion, $EditLanguage, $tpl, $FromLanguage ) ) )