Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9076] trunk/lib/plugin
|
From: <var...@us...> - 2014-09-12 14:22:05
|
Revision: 9076
http://sourceforge.net/p/phpwiki/code/9076
Author: vargenau
Date: 2014-09-12 14:22:01 +0000 (Fri, 12 Sep 2014)
Log Message:
-----------
WikiAdmin: no checkboxes in confirmation step
Modified Paths:
--------------
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSetAcl.php
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2014-09-12 14:18:12 UTC (rev 9075)
+++ trunk/lib/plugin/WikiAdminPurge.php 2014-09-12 14:22:01 UTC (rev 9076)
@@ -138,16 +138,18 @@
// List all pages to select from.
$pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
}
- $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array());
- $pagelist->addPageList($pages);
$header = HTML::fieldset();
if ($next_action == 'verify') {
+ $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], array());
+ $pagelist->addPageList($pages);
$button_label = _("Yes");
$header->pushContent(HTML::legend(_("Confirm purge")));
$header->pushContent(HTML::p(HTML::strong(
_("Are you sure you want to permanently purge the following files?"))));
} else {
+ $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array());
+ $pagelist->addPageList($pages);
$button_label = _("Permanently purge selected pages");
$header->pushContent(HTML::legend(_("Select the files to purge")));
}
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2014-09-12 14:18:12 UTC (rev 9075)
+++ trunk/lib/plugin/WikiAdminRemove.php 2014-09-12 14:22:01 UTC (rev 9076)
@@ -188,19 +188,24 @@
// List all pages to select from.
$pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
}
- $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
- array('types' =>
- array('remove'
- => new _PageList_Column_remove('remove', _("Remove")))));
- $pagelist->addPageList($pages);
$header = HTML::fieldset();
if ($next_action == 'verify') {
+ $pagelist = new PageList_Unselectable($args['info'], $args['exclude'],
+ array('types' =>
+ array('remove'
+ => new _PageList_Column_remove('remove', _("Remove")))));
+ $pagelist->addPageList($pages);
$button_label = _("Yes");
$header->pushContent(HTML::legend(_("Confirm removal")));
$header->pushContent(HTML::p(HTML::strong(
_("Are you sure you want to remove the selected files?"))));
} else {
+ $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
+ array('types' =>
+ array('remove'
+ => new _PageList_Column_remove('remove', _("Remove")))));
+ $pagelist->addPageList($pages);
$button_label = _("Remove selected pages");
$header->pushContent(HTML::legend(_("Select the files to remove")));
if ($args['min_age'] > 0) {
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2014-09-12 14:18:12 UTC (rev 9075)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2014-09-12 14:22:01 UTC (rev 9076)
@@ -112,18 +112,21 @@
array('types' => array('hi_content'
=> new _PageList_Column_content('rev:hi_content', _("Content")))));
}
- $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns);
- $pagelist->addPageList($pages);
$header = HTML::fieldset();
$header->pushContent(HTML::legend(_("Select the pages to search and replace")));
if ($next_action == 'verify') {
+ $args['info'] = "pagename,mtime,author";
+ $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], $columns);
+ $pagelist->addPageList($pages);
$button_label = _("Replace");
$header->pushContent(
HTML::p(HTML::strong(
_("Are you sure you want to replace text in the selected files?"))));
$this->replaceForm($header, $post_args);
} else {
+ $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns);
+ $pagelist->addPageList($pages);
$button_label = _("Search");
$this->replaceForm($header, $post_args);
}
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2014-09-12 14:18:12 UTC (rev 9075)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2014-09-12 14:22:01 UTC (rev 9076)
@@ -183,25 +183,30 @@
// List all pages to select from.
$pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
}
- if ($next_action == 'verify') {
- $args['info'] = "checkbox,pagename,perm,mtime,owner,author";
- }
- $pagelist = new PageList_Selectable($args['info'],
- $args['exclude'],
- array('types' => array(
- 'perm'
- => new _PageList_Column_perm('perm', _("Permission")),
- 'acl'
- => new _PageList_Column_acl('acl', _("ACL")))));
- $pagelist->addPageList($pages);
if ($next_action == 'verify') {
+ $pagelist = new PageList_Unselectable($args['info'],
+ $args['exclude'],
+ array('types' => array(
+ 'perm'
+ => new _PageList_Column_perm('perm', _("Permission")),
+ 'acl'
+ => new _PageList_Column_acl('acl', _("ACL")))));
+ $pagelist->addPageList($pages);
$button_label = _("Yes");
$header = $this->setaclForm($header, $post_args, $pages);
$header->pushContent(
HTML::p(HTML::strong(
_("Are you sure you want to permanently change access rights to the selected files?"))));
} else {
+ $pagelist = new PageList_Selectable($args['info'],
+ $args['exclude'],
+ array('types' => array(
+ 'perm'
+ => new _PageList_Column_perm('perm', _("Permission")),
+ 'acl'
+ => new _PageList_Column_acl('acl', _("ACL")))));
+ $pagelist->addPageList($pages);
$button_label = _("Change Access Rights");
$header = $this->setaclForm($header, $post_args, $pages);
$header->pushContent(HTML::legend(_("Select the pages where to change access rights")));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
