Просмотр исходного кода

#2304 Wiki functionality: system wiki blocks

Alex Trofimov 6 лет назад
Родитель
Сommit
2a3be55560

+ 4 - 1
inc/classes/BxDolWiki.php

@@ -87,7 +87,7 @@ class BxDolWiki extends BxDolFactory implements iBxDolFactoryObject
 
         $aObject = BxDolWikiQuery::getWikiObject($sObject);
         if (!$aObject || !is_array($aObject))
-            return false;
+            $aObject = BxDolWikiQuery::getWikiObject('system');
 
         $sClass = empty($aObject['override_class_name']) ? 'BxDolWiki' : $aObject['override_class_name'];
         if (!empty($aObject['override_class_file']))
@@ -148,6 +148,9 @@ class BxDolWiki extends BxDolFactory implements iBxDolFactoryObject
      */
     public function isAllowed ($sType, $iProfileId = false)
     {
+        if (isAdmin())
+            return true;
+
         $aTypes = array(
             'add' => 'allow_add_for_levels',
             'edit' => 'allow_edit_for_levels',

+ 4 - 0
install/sql/system.sql

@@ -4855,6 +4855,10 @@ CREATE TABLE IF NOT EXISTS `sys_objects_wiki` (
   UNIQUE KEY `uri` (`uri`)
 );
 
+INSERT INTO `sys_objects_wiki` (`object`, `uri`, `title`, `module`, `allow_add_for_levels`, `allow_edit_for_levels`, `allow_delete_for_levels`, `allow_translate_for_levels`, `allow_unsafe_for_levels`, `override_class_name`, `override_class_file`) VALUES
+('system', '', '_sys_wiki_system_title', 'system', 0, 0, 0, 0, 0, '', '');
+
+
 CREATE TABLE IF NOT EXISTS `sys_pages_wiki_blocks` (
   `id` int(10) UNSIGNED NOT NULL,
   `block_id` int(11) NOT NULL,

+ 1 - 0
modules/boonex/wiki/install/langs/en.xml

@@ -2,6 +2,7 @@
 <resources name="en" flag="gb" title="English">
     <string name="_sys_module_wiki"><![CDATA[Wiki]]></string>
     <string name="_bx_wiki"><![CDATA[Wiki]]></string>
+    <string name="_bx_wiki_object_title"><![CDATA[Wiki]]></string>
     <string name="_bx_wiki_page_home"><![CDATA[Wiki Home]]></string>
     <string name="_bx_wiki_block_home"><![CDATA[Wiki Home]]></string>
     <string name="_bx_wiki_menu_item_title_system_home"><![CDATA[Wiki]]></string>

+ 1 - 1
modules/boonex/wiki/install/sql/enable.sql

@@ -2,7 +2,7 @@
 -- Wiki object
 
 INSERT INTO `sys_objects_wiki` (`object`, `uri`, `title`, `module`, `allow_add_for_levels`, `allow_edit_for_levels`, `allow_delete_for_levels`, `allow_translate_for_levels`, `allow_unsafe_for_levels`, `override_class_name`, `override_class_file`) VALUES
-('bx_wiki', 'wiki', '_sys_wiki_system_title', 'system', 192, 192, 192, 192, 192, '', '');
+('bx_wiki', 'wiki', '_bx_wiki_object_title', 'system', 192, 192, 192, 192, 192, '', '');
 
 -- Permalinks