Author: mj
Date: Wed Oct 26 12:16:51 2011
New Revision: 10192
Log:
Fixes to advanced search, GSR to fix David's "refactoring".
Modified:
trunk/apps/qubit/config/settings.yml.tmpl
trunk/apps/qubit/modules/search/actions/globalReplaceAction.class.php
trunk/apps/qubit/modules/search/templates/_advancedSearch.php
trunk/apps/qubit/modules/search/templates/advancedSuccess.php
trunk/apps/qubit/modules/search/templates/globalReplaceSuccess.php
Modified: trunk/apps/qubit/config/settings.yml.tmpl
==============================================================================
--- trunk/apps/qubit/config/settings.yml.tmpl Wed Oct 26 11:39:40 2011
(r10191)
+++ trunk/apps/qubit/config/settings.yml.tmpl Wed Oct 26 12:16:51 2011
(r10192)
@@ -5,6 +5,7 @@
.settings:
no_script_name: false
logging_enabled: false
+ cache: true
dev:
.settings:
Modified: trunk/apps/qubit/modules/search/actions/globalReplaceAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/search/actions/globalReplaceAction.class.php
Wed Oct 26 11:39:40 2011 (r10191)
+++ trunk/apps/qubit/modules/search/actions/globalReplaceAction.class.php
Wed Oct 26 12:16:51 2011 (r10192)
@@ -33,7 +33,6 @@
if (empty($request->pattern) || empty($request->replacement))
{
$this->error = $this->context->i18n->__('Both source and replacement
fields are required.');
-
return;
}
// Make sure we have confirmed the action
Modified: trunk/apps/qubit/modules/search/templates/_advancedSearch.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/_advancedSearch.php Wed Oct
26 11:39:40 2011 (r10191)
+++ trunk/apps/qubit/modules/search/templates/_advancedSearch.php Wed Oct
26 12:16:51 2011 (r10192)
@@ -1,4 +1,11 @@
-<?php echo $form->renderFormTag(url_for(array('module' => 'search', 'action'
=> 'advanced')), array('method' => 'get')) ?>
+<?php echo $form->renderFormTag(url_for(array('module' => 'search', 'action'
=> $action)), array('name' => 'form', 'method' => 'get')) ?>
+
+<?php if (isset($form->confirm)): ?>
+
+ <?php echo $form->renderHiddenFields() ?>
+ <div style="display: none;">
+
+<?php endif; ?>
<div class="form-item form-item-identifier">
<table class="multiRow" style="white-space: nowrap;">
@@ -26,12 +33,64 @@
</fieldset>
+<?php if (isset($form->pager) && 'globalReplace' == $action): ?>
+
+ <div class="form-item form-item-identifier">
+ <table>
+ <tbody>
+ <tr>
+ <td>
+ <?php echo __('Replace') ?>:
+ </td><td style="padding: 0px;">
+ <?php echo $form->pattern->render() ?>
+ </td><td>
+ <?php echo __('With') ?>:
+ </td><td style="padding: 0px;">
+ <?php echo $form->replacement->render() ?>
+ </td><td style="white-space: nowrap;"><?php echo __('in') ?>:
+ <?php echo $form->column->render() ?>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <?php echo __('Case-sensitive') ?>
+ <?php echo $form->caseSensitive->render() ?>
+ </td>
+ <td colspan="3">
+ <?php echo __('Use regular expression syntax') ?>
+ <?php echo $form->allowRegex->render() ?>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+<?php endif; ?>
+
+<?php if (isset($form->confirm)): ?>
+ </div>
+<?php endif; ?>
+
<div class="actions">
<h2 class="element-invisible"><?php echo __('Actions') ?></h2>
<div class="content">
<ul class="clearfix links">
- <input type="submit" name="Submit" class="form-submit" value="Search" />
+
+ <?php if (isset($form->confirm)): ?>
+
+ <li><a href="#" title="<?php echo __('Cancel') ?>"
onclick="document.form.submit();"><?php echo __('Cancel') ?></a></li>
+ <li><input class="danger form-submit" type="submit" value="<?php echo
__('Replace') ?>" onclick="document.form.method = 'post';"/></li>
+
+ <?php else: ?>
+ <input type="submit" name="Submit" class="form-submit" value="<?php
echo __('Search') ?>" />
+
+ <?php if (isset($form->pager) && 'globalReplace' == $action): ?>
+ <li><a class="delete" href="#" title="<?php echo __('Replace') ?>"
onclick="document.form.method = 'post'; document.form.submit();"><?php echo
__('Replace') ?></a></li>
+ <?php endif; ?>
+
+ <?php endif; ?>
+
</ul>
</div>
Modified: trunk/apps/qubit/modules/search/templates/advancedSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/advancedSuccess.php Wed Oct
26 11:39:40 2011 (r10191)
+++ trunk/apps/qubit/modules/search/templates/advancedSuccess.php Wed Oct
26 12:16:51 2011 (r10192)
@@ -18,21 +18,21 @@
</div>
</h1>
- <?php if ('print' != $sf_request->getParameter('media')): ?>
- <?php echo get_partial('search/advancedSearch', array('form' => $form)) ?>
- <?php else: ?>
- <?php echo get_partial('printAdvancedSearchTerms', array('queryTerms' =>
$queryTerms)) ?>
- <?php endif; ?>
-
- <?php if (isset($error)): ?>
-
- <div class="error">
- <ul>
- <li><?php echo $error ?></li>
- </ul>
- </div>
+<?php if ('print' != $sf_request->getParameter('media')): ?>
+ <?php echo get_partial('search/advancedSearch', array('form' => $form,
'action' => 'advanced')) ?>
+<?php else: ?>
+ <?php echo get_partial('printAdvancedSearchTerms', array('queryTerms' =>
$queryTerms)) ?>
+<?php endif; ?>
+
+<?php if (isset($error)): ?>
- <?php endif; ?>
+ <div class="error">
+ <ul>
+ <li><?php echo $error ?></li>
+ </ul>
+ </div>
+
+<?php endif; ?>
<?php if (isset($pager)): ?>
Modified: trunk/apps/qubit/modules/search/templates/globalReplaceSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/globalReplaceSuccess.php Wed Oct
26 11:39:40 2011 (r10191)
+++ trunk/apps/qubit/modules/search/templates/globalReplaceSuccess.php Wed Oct
26 12:16:51 2011 (r10192)
@@ -1,79 +1,21 @@
+<?php use_helper('Text') ?>
+
<h1><?php echo esc_entities($title) ?></h1>
-<?php echo $form->renderFormTag(url_for(array('module' => 'search', 'action'
=> 'globalReplace')), array('name' => 'form', 'method' => 'get')) ?>
+<?php if (isset($pager)): ?>
+ <?php $form->pager = true; ?>
+<?php endif; ?>
- <?php if (isset($form->confirm)): ?>
+<?php if (isset($form->confirm)): ?>
<h3 style="font-weight: normal;"><?php echo __('This will permanently modify
%1% records.', array('%1%' => count($pager->hits))) ?></h3>
<div class="error">
<h2><?php echo __('This action cannot be undone!') ?></li></h2>
</div>
- <?php echo $form->renderHiddenFields() ?>
- <div style="display: none;">
-
- <?php endif; ?>
-
- <?php echo get_partial('search/advancedSearch', array('form' => $form)) ?>
-
- <?php if (isset($pager)): ?>
+<?php endif; ?>
- <div class="form-item form-item-identifier">
- <table>
- <tbody>
- <tr>
- <td>
- <?php echo __('Replace') ?>:
- </td><td style="padding: 0px;">
- <?php echo $form->pattern->render() ?>
- </td><td>
- <?php echo __('With') ?>:
- </td><td style="padding: 0px;">
- <?php echo $form->replacement->render() ?>
- </td><td style="white-space: nowrap;"><?php echo __('in') ?>:
- <?php echo $form->column->render() ?>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <?php echo __('Case-sensitive') ?>
- <?php echo $form->caseSensitive->render() ?>
- </td>
- <td colspan="3">
- <?php echo __('Use regular expression syntax') ?>
- <?php echo $form->allowRegex->render() ?>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-
- <?php endif; ?>
-
- <?php if (isset($form->confirm)): ?>
- </div>
- <?php endif; ?>
-
- <div class="actions">
- <div class="content">
- <ul class="clearfix links">
-
- <?php if (isset($form->confirm)): ?>
-
- <li><a href="#" title="<?php echo __('Cancel') ?>"
onclick="document.form.submit();"><?php echo __('Cancel') ?></a></li>
- <li><input class="danger form-submit" type="submit" value="<?php
echo __('Replace') ?>" onclick="document.form.method = 'post';"/></li>
-
- <?php else: ?>
- <input type="submit" name="Submit" class="form-submit" value="<?php
echo __('Search') ?>" />
-
- <?php if (isset($pager)): ?>
- <li><a class="delete" href="#" title="<?php echo __('Replace') ?>"
onclick="document.form.method = 'post'; document.form.submit();"><?php echo
__('Replace') ?></a></li>
- <?php endif; ?>
-
- <?php endif; ?>
- </ul>
- </div>
- </div>
+<?php echo get_partial('search/advancedSearch', array('form' => $form,
'action' => 'globalReplace')) ?>
<?php if (isset($error)): ?>
@@ -85,10 +27,8 @@
<?php endif; ?>
-</form>
-
<?php if (isset($pager) && !isset($form->confirm)): ?>
<?php echo get_partial('search/searchResults', array('pager' => $pager,
'timer' => $timer)) ?>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
