Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F823741
D172.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Mon, Mar 10, 1:23 PM
Size
3 KB
Mime Type
text/x-diff
Expires
Tue, Mar 11, 1:23 PM (1 h, 41 m)
Engine
blob
Format
Raw Data
Handle
585826
Attached To
D172: MINN-10 - Don't use Web Request during Article adding/editing
D172.diff
View Options
Index: branches/5.2.x/admin_templates/articles/articles_edit.tpl
===================================================================
--- branches/5.2.x/admin_templates/articles/articles_edit.tpl
+++ branches/5.2.x/admin_templates/articles/articles_edit.tpl
@@ -68,10 +68,16 @@
<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="Body" title="la_fld_Body" control_options="{min_height: 100}" allow_html="1" cols="70" rows="8" display_original="1"/>
<!-- excerpt: begin -->
- <inp2:m_RenderElement design="form_row" prefix="n" field="Excerpt" title="la_fld_Excerpt">
+ <inp2:m_RenderElement design="form_row" prefix="n" field="Excerpt" generate_field="GenerateExcerpt" title="la_fld_Excerpt">
<td class="control-cell">
<textarea tabindex="<inp2:m_get param='tab_index'/>" id="<inp2:$prefix_InputName field='$field'/>" name="<inp2:$prefix_InputName field='$field'/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:$prefix_Field field="$field"/></textarea><br />
- <input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label>
+
+ <input type="hidden" id="<inp2:{$prefix}_InputName field='$generate_field'/>" name="<inp2:{$prefix}_InputName field='$generate_field'/>" value="<inp2:{$prefix}_Field field='$generate_field' db='db'/>"/>
+
+ <label>
+ <input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='$generate_field'/>" <inp2:{$prefix}_Field field="$generate_field" checked="checked" db="db"/> onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='$generate_field'/>'));"/>
+ <inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/>
+ </label>
</td>
</inp2:m_RenderElement>
<!-- excerpt: end -->
@@ -129,4 +135,4 @@
}
</script>
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/units/articles/articles_config.php
===================================================================
--- branches/5.2.x/units/articles/articles_config.php
+++ branches/5.2.x/units/articles/articles_config.php
@@ -460,6 +460,11 @@
'IsPop' => Array ('type' => 'int', 'default' => 0),
'CachedNavbar' => Array ('type' => 'string', 'default' => ''),
'ParentPath' => Array ('type' => 'string', 'default' => ''),
+ 'GenerateExcerpt' => array(
+ 'type' => 'int',
+ 'formatter' => 'kOptionsFormatter', 'options' => array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+ 'default' => 0,
+ ),
// for primary image
'AltName' => Array ('type' => 'string', 'default' => ''),
Index: branches/5.2.x/units/articles/articles_event_handler.php
===================================================================
--- branches/5.2.x/units/articles/articles_event_handler.php
+++ branches/5.2.x/units/articles/articles_event_handler.php
@@ -459,7 +459,7 @@
$object = $event->getObject();
/* @var $object kDBItem */
- if ( !$object->GetField('Excerpt') || $this->Application->GetVar('generate_excerpt') ) {
+ if ( !$object->GetField('Excerpt') || $object->GetDBField('GenerateExcerpt') ) {
$excerpt = strip_tags($object->GetField('Body'));
Event Timeline
Log In to Comment