makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/soft-delete] Merge functionality of m_approve and m_restore

Browse source 
The problems with having two different permissions are just too big and cause
huge queries, if they are granted differently. Also it's quite hard to decide
what should happen when a moderator has only one permission and the topic has
only posts of the two hidden types. To avoid all this, we merge them so it's a
simple switch: either the user is a moderator, then he can see all posts,
or he is not, then he can only see approved ones.

PHPBB3-9567
This commit is contained in:
Joas Schilling 2012-10-05 12:05:22 +02:00
parent b8642d7c8a
commit 959525cebe
3 changed files with 4 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/content_visibility/get_forums_visibility_sql_test.php
View file

@ -22,7 +22,6 @@ class phpbb_content_visibility_get_forums_visibility_sql_test extends phpbb_data
'topic', array(1, 2, 3), '', 'topic', array(1, 2, 3), '',
array( array(
array('m_approve', true, array(1 => true, 2 => true, 3 => true)), array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
), ),
array( array(
array('topic_id' => 1), array('topic_id' => 1),
@ -41,7 +40,6 @@ class phpbb_content_visibility_get_forums_visibility_sql_test extends phpbb_data
'topic', array(1, 2), '', 'topic', array(1, 2), '',
array( array(
array('m_approve', true, array(1 => true, 2 => true, 3 => true)), array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
), ),
array( array(
array('topic_id' => 1), array('topic_id' => 1),
@ -57,13 +55,12 @@ class phpbb_content_visibility_get_forums_visibility_sql_test extends phpbb_data
'topic', array(1, 2, 3), '', 'topic', array(1, 2, 3), '',
array( array(
array('m_approve', true, array(2 => true)), array('m_approve', true, array(2 => true)),
array('m_restore', true, array(1 => true)),
), ),
array( array(
array('topic_id' => 2), array('topic_id' => 2),
array('topic_id' => 3),
array('topic_id' => 4), array('topic_id' => 4),
array('topic_id' => 5), array('topic_id' => 5),
array('topic_id' => 6),
array('topic_id' => 8), array('topic_id' => 8),
), ),
), ),
@ -72,7 +69,6 @@ class phpbb_content_visibility_get_forums_visibility_sql_test extends phpbb_data
'post', array(1, 2, 3), '', 'post', array(1, 2, 3), '',
array( array(
array('m_approve', true, array(1 => true, 2 => true, 3 => true)), array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
), ),
array( array(
array('post_id' => 1), array('post_id' => 1),
@ -91,7 +87,6 @@ class phpbb_content_visibility_get_forums_visibility_sql_test extends phpbb_data
'post', array(1, 2), '', 'post', array(1, 2), '',
array( array(
array('m_approve', true, array(1 => true, 2 => true, 3 => true)), array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
), ),
array( array(
array('post_id' => 1), array('post_id' => 1),
@ -107,13 +102,12 @@ class phpbb_content_visibility_get_forums_visibility_sql_test extends phpbb_data
'post', array(1, 2, 3), '', 'post', array(1, 2, 3), '',
array( array(
array('m_approve', true, array(2 => true)), array('m_approve', true, array(2 => true)),
array('m_restore', true, array(1 => true)),
), ),
array( array(
array('post_id' => 2), array('post_id' => 2),
array('post_id' => 3),
array('post_id' => 4), array('post_id' => 4),
array('post_id' => 5), array('post_id' => 5),
array('post_id' => 6),
array('post_id' => 8), array('post_id' => 8),
), ),
), ),

10
tests/content_visibility/get_global_visibility_sql_test.php
View file

@ -22,7 +22,6 @@ class phpbb_content_visibility_get_global_visibility_sql_test extends phpbb_data
'topic', array(), '', 'topic', array(), '',
array( array(
array('m_approve', true, array(1 => true, 2 => true, 3 => true)), array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
), ),
array( array(
array('topic_id' => 1), array('topic_id' => 1),
@ -41,7 +40,6 @@ class phpbb_content_visibility_get_global_visibility_sql_test extends phpbb_data
'topic', array(3), '', 'topic', array(3), '',
array( array(
array('m_approve', true, array(1 => true, 2 => true, 3 => true)), array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
), ),
array( array(
array('topic_id' => 1), array('topic_id' => 1),
@ -57,13 +55,12 @@ class phpbb_content_visibility_get_global_visibility_sql_test extends phpbb_data
'topic', array(), '', 'topic', array(), '',
array( array(
array('m_approve', true, array(2 => true)), array('m_approve', true, array(2 => true)),
array('m_restore', true, array(1 => true)),
), ),
array( array(
array('topic_id' => 2), array('topic_id' => 2),
array('topic_id' => 3),
array('topic_id' => 4), array('topic_id' => 4),
array('topic_id' => 5), array('topic_id' => 5),
array('topic_id' => 6),
array('topic_id' => 8), array('topic_id' => 8),
), ),
), ),
@ -72,7 +69,6 @@ class phpbb_content_visibility_get_global_visibility_sql_test extends phpbb_data
'post', array(), '', 'post', array(), '',
array( array(
array('m_approve', true, array(1 => true, 2 => true, 3 => true)), array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
), ),
array( array(
array('post_id' => 1), array('post_id' => 1),
@ -91,7 +87,6 @@ class phpbb_content_visibility_get_global_visibility_sql_test extends phpbb_data
'post', array(3), '', 'post', array(3), '',
array( array(
array('m_approve', true, array(1 => true, 2 => true, 3 => true)), array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
), ),
array( array(
array('post_id' => 1), array('post_id' => 1),
@ -107,13 +102,12 @@ class phpbb_content_visibility_get_global_visibility_sql_test extends phpbb_data
'post', array(), '', 'post', array(), '',
array( array(
array('m_approve', true, array(2 => true)), array('m_approve', true, array(2 => true)),
array('m_restore', true, array(1 => true)),
), ),
array( array(
array('post_id' => 2), array('post_id' => 2),
array('post_id' => 3),
array('post_id' => 4), array('post_id' => 4),
array('post_id' => 5), array('post_id' => 5),
array('post_id' => 6),
array('post_id' => 8), array('post_id' => 8),
), ),
), ),

46
tests/content_visibility/get_visibility_sql_test.php
View file

@ -22,7 +22,6 @@ class phpbb_content_visibility_get_visibility_sql_test extends phpbb_database_te
'post', 1, '', 'post', 1, '',
array( array(
array('m_approve', 1, true), array('m_approve', 1, true),
array('m_restore', 1, true),
), ),
array( array(
array('post_id' => 1), array('post_id' => 1),
@ -34,44 +33,9 @@ class phpbb_content_visibility_get_visibility_sql_test extends phpbb_database_te
'phpbb_posts', 'phpbb_posts',
'post', 1, '', 'post', 1, '',
array( array(
array('m_approve', 1, true),
),
array(
array('post_id' => 1),
array('post_id' => 2),
),
),
array(
'phpbb_posts',
'post', 1, '',
array(
array('m_restore', 1, true),
), ),
array( array(
array('post_id' => 2), array('post_id' => 2),
array('post_id' => 3),
),
),
array(
'phpbb_posts',
'post', 1, '',
array(
),
array(
array('post_id' => 2),
),
),
array(
'phpbb_topics',
'topic', 1, '',
array(
array('m_approve', 1, true),
array('m_restore', 1, true),
),
array(
array('topic_id' => 1),
array('topic_id' => 2),
array('topic_id' => 3),
), ),
), ),
array( array(
@ -83,16 +47,6 @@ class phpbb_content_visibility_get_visibility_sql_test extends phpbb_database_te
array( array(
array('topic_id' => 1), array('topic_id' => 1),
array('topic_id' => 2), array('topic_id' => 2),
),
),
array(
'phpbb_topics',
'topic', 1, '',
array(
array('m_restore', 1, true),
),
array(
array('topic_id' => 2),
array('topic_id' => 3), array('topic_id' => 3),
), ),
), ),