diff --git a/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql b/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql index 44fb18fed7daf..eb6fe6b35a5cf 100644 --- a/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql +++ b/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql @@ -1 +1,3 @@ -# Placeholder file for database changes for version 2.5.7 \ No newline at end of file +# Placeholder file for database changes for version 2.5.7 +UPDATE `#__assets` SET name=REPLACE( name, 'com_user.notes.category','com_users.category' ); +UPDATE `#__categories` SET extension=REPLACE( extension, 'com_user.notes.category','com_users.category' ); diff --git a/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql b/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql index 44fb18fed7daf..93730f04ab4c3 100644 --- a/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql +++ b/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql @@ -1 +1,3 @@ -# Placeholder file for database changes for version 2.5.7 \ No newline at end of file +# Placeholder file for database changes for version 2.5.7 +UPDATE [#__assets] SET name=REPLACE( name, 'com_user.notes.category','com_users.category' ); +UPDATE [#__assets] SET name=REPLACE( name, 'com_user.notes.category','com_users.category' ); diff --git a/administrator/components/com_users/access.xml b/administrator/components/com_users/access.xml index fc49f555d0831..bcf13c6888c4d 100644 --- a/administrator/components/com_users/access.xml +++ b/administrator/components/com_users/access.xml @@ -8,4 +8,11 @@ +
+ + + + + +
diff --git a/administrator/components/com_users/controller.php b/administrator/components/com_users/controller.php index 4c8cc56cf2caf..9f515308bbf5a 100644 --- a/administrator/components/com_users/controller.php +++ b/administrator/components/com_users/controller.php @@ -96,7 +96,7 @@ public function display($cachable = false, $urlparams = false) // Somehow the person just went to the form - we don't allow that. $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id)); $this->setMessage($this->getError(), 'error'); - $this->setRedirect(JRoute::_('index.php?option=com_users&view=groups', false)); + $this->setRedirect(JRoute::_('index.php?option=com_users&view=notes', false)); return false; } diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php index a6fc1df48bc40..afc92a6d774d0 100755 --- a/administrator/components/com_users/helpers/users.php +++ b/administrator/components/com_users/helpers/users.php @@ -66,8 +66,8 @@ public static function addSubmenu($vName) $extension = JRequest::getString('extension'); JSubMenuHelper::addEntry( JText::_('COM_USERS_SUBMENU_NOTE_CATEGORIES'), - 'index.php?option=com_categories&extension=com_users.notes', - $vName == 'categories' || $extension == 'com_users.notes' + 'index.php?option=com_categories&extension=com_users', + $vName == 'categories' || $extension == 'com_users' ); } } diff --git a/administrator/components/com_users/models/forms/note.xml b/administrator/components/com_users/models/forms/note.xml index cabda6b4978ec..e831174ef63de 100644 --- a/administrator/components/com_users/models/forms/note.xml +++ b/administrator/components/com_users/models/forms/note.xml @@ -24,7 +24,7 @@ name="catid" type="category" class="inputbox" - extension="com_users.notes" + extension="com_users" label="COM_USERS_FIELD_CATEGORY_ID_LABEL" description="JFIELD_CATEGORY_DESC" > @@ -123,4 +123,4 @@ class="inputbox" format="%Y-%m-%d %H:%M:%S" size="22" filter="user_utc" /> - \ No newline at end of file + diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php index 192fff4305347..bdf2ceb90ce7d 100644 --- a/administrator/modules/mod_menu/tmpl/default_enabled.php +++ b/administrator/modules/mod_menu/tmpl/default_enabled.php @@ -140,14 +140,14 @@ } $menu->addChild( - new JMenuNode(JText::_('MOD_MENU_COM_USERS_NOTE_CATEGORIES'), 'index.php?option=com_categories&view=categories&extension=com_users.notes', 'class:category'), + new JMenuNode(JText::_('MOD_MENU_COM_USERS_NOTE_CATEGORIES'), 'index.php?option=com_categories&view=categories&extension=com_users', 'class:category'), $createUser ); if ($createUser) { $menu->addChild( - new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_NEW_CATEGORY'), 'index.php?option=com_categories&task=category.add&extension=com_users.notes', 'class:newarticle') + new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_NEW_CATEGORY'), 'index.php?option=com_categories&task=category.add&extension=com_users', 'class:newarticle') ); $menu->getParent(); } diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index 1121baea5a8c0..17a9cfdf78d6e 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -56,7 +56,7 @@ VALUES (29, 7, 14, 15, 2, 'com_contact.category.4', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (30, 19, 42, 43, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (31, 25, 58, 59, 2, 'com_weblinks.category.6', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), -(32, 24, 54, 55, 1, 'com_users.notes.category.7', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), +(32, 24, 54, 55, 1, 'com_users.category.7', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (33, 1, 63, 64, 1, 'com_finder', 'com_finder', '{"core.admin":{"7":1},"core.manage":{"6":1}}'), (34, 1, 65, 66, 1, 'com_joomlaupdate', 'com_joomlaupdate', '{"core.admin":[],"core.manage":[],"core.delete":[],"core.edit.state":[]}'); @@ -209,7 +209,7 @@ INSERT INTO `#__categories` VALUES (4, 29, 1, 5, 6, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:27:57', 0, '0000-00-00 00:00:00', 0, '*'), (5, 30, 1, 7, 8, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:15', 0, '0000-00-00 00:00:00', 0, '*'), (6, 31, 1, 9, 10, 1, 'uncategorised', 'com_weblinks', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '0000-00-00 00:00:00', 0, '*'), -(7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users.notes', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '0000-00-00 00:00:00', 0, '*'); +(7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '0000-00-00 00:00:00', 0, '*'); # ------------------------------------------------------- diff --git a/installation/sql/mysql/sample_blog.sql b/installation/sql/mysql/sample_blog.sql index 5580584dc9eb0..265c2f0c78735 100644 --- a/installation/sql/mysql/sample_blog.sql +++ b/installation/sql/mysql/sample_blog.sql @@ -41,7 +41,7 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl (29, 7, 14, 15, 2, 'com_contact.category.4', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (30, 19, 54, 55, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (31, 25, 70, 71, 2, 'com_weblinks.category.6', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), -(32, 24, 66, 67, 1, 'com_users.notes.category.7', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), +(32, 24, 66, 67, 1, 'com_users.category.7', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (33, 1, 77, 78, 1, 'com_finder', 'com_finder', '{"core.admin":{"7":1},"core.manage":{"6":1}}'), (34, 25, 72, 73, 2, 'com_weblinks.category.8', 'Blog Roll', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (35, 8, 24, 31, 2, 'com_content.category.9', 'Blog', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), @@ -65,7 +65,7 @@ REPLACE INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, `leve (4, 29, 1, 5, 6, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:27:57', 0, '0000-00-00 00:00:00', 0, '*'), (5, 30, 1, 7, 8, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:15', 0, '0000-00-00 00:00:00', 0, '*'), (6, 31, 1, 9, 10, 1, 'uncategorised', 'com_weblinks', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '0000-00-00 00:00:00', 0, '*'), -(7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users.notes', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '0000-00-00 00:00:00', 0, '*'), +(7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '0000-00-00 00:00:00', 0, '*'), (8, 34, 1, 13, 14, 1, 'blog-roll', 'com_weblinks', 'Blog Roll', 'blog-roll', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2012-01-04 15:02:08', 0, '0000-00-00 00:00:00', 0, '*'), (9, 35, 1, 15, 16, 1, 'blog', 'com_content', 'Blog', 'blog', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2012-01-04 15:43:10', 0, '0000-00-00 00:00:00', 0, '*'); diff --git a/installation/sql/mysql/sample_brochure.sql b/installation/sql/mysql/sample_brochure.sql index c7be86e8547e8..8136a4b9d3073 100644 --- a/installation/sql/mysql/sample_brochure.sql +++ b/installation/sql/mysql/sample_brochure.sql @@ -42,7 +42,7 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl (29, 7, 14, 15, 2, 'com_contact.category.4', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (30, 19, 56, 57, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (31, 25, 72, 73, 2, 'com_weblinks.category.6', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), -(32, 24, 68, 69, 1, 'com_users.notes.category.7', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), +(32, 24, 68, 69, 1, 'com_users.category.7', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (33, 1, 77, 78, 1, 'com_finder', 'com_finder', '{"core.admin":{"7":1},"core.manage":{"6":1}}'), (34, 27, 19, 20, 3, 'com_content.article.1', 'Home Page Title', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (35, 27, 21, 22, 3, 'com_content.article.2', 'About Us', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'), @@ -66,7 +66,7 @@ INSERT IGNORE INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, (4, 29, 1, 5, 6, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:27:57', 0, '0000-00-00 00:00:00', 0, '*'), (5, 30, 1, 7, 8, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:15', 0, '0000-00-00 00:00:00', 0, '*'), (6, 31, 1, 9, 10, 1, 'uncategorised', 'com_weblinks', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '0000-00-00 00:00:00', 0, '*'), -(7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users.notes', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '0000-00-00 00:00:00', 0, '*'), +(7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '0000-00-00 00:00:00', 0, '*'), (8, 36, 1, 13, 14, 1, 'news', 'com_content', 'News', 'news', '', '

This is the latest new from us.

\r\n

You can edit this description in the Content Category Manager.

\r\n

This will show the most recent article. You can easily change it to show more if you wish.

\r\n

The module on the left shows a list of older articles.

', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2012-01-04 03:09:08', 42, '2012-01-04 04:32:05', 0, '*'); -- diff --git a/installation/sql/mysql/sample_data.sql b/installation/sql/mysql/sample_data.sql index 8c8c2ee863408..e382c3e4e7dec 100644 --- a/installation/sql/mysql/sample_data.sql +++ b/installation/sql/mysql/sample_data.sql @@ -166,7 +166,7 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl (166, 47, 183, 188, 6, 'com_content.category.75', 'Navigation Modules', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (167, 54, 291, 292, 4, 'com_content.category.76', 'Recipes', '{"core.create":{"12":1,"10":1},"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":{"12":1,"10":1}}'), (168, 34, 106, 107, 3, 'com_content.article.67', 'What''s New in 1.5?', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'), -(169, 24, 337, 338, 2, 'com_users.notes.category.77', 'Uncategorised', ''), +(169, 24, 337, 338, 2, 'com_users.category.77', 'Uncategorised', ''), (170, 50, 219, 220, 6, 'com_content.article.68', 'Captcha', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (171, 50, 221, 222, 6, 'com_content.article.69', 'Quick Icons', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (172, 96, 178, 179, 7, 'com_content.article.70', 'Smart Search', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'), @@ -265,7 +265,7 @@ INSERT IGNORE INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, (73, 109, 28, 46, 47, 4, 'sample-data-articles/park-site/photo-gallery/scenery', 'com_content', 'Scenery', 'scenery', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 42, '2011-01-01 00:00:01', 0, 'en-GB'), (75, 166, 22, 23, 24, 5, 'sample-data-articles/joomla/extensions/modules/navigation-modules', 'com_content', 'Navigation Modules', 'navigation-modules', '', '

Navigation modules help your visitors move through your site and find what they need.

\r\n

Menus provide your site with structure and help your visitors navigate your site.  Although they are all based on the same menu module, the variety of ways menus are used in the sample data show how flexible this module is.

\r\n

A menu can range from extremely simple (for example the top menu or the menu for the Australian Parks sample site) to extremely complex (for example the About Joomla! menu with its many levels). They can also be used for other types of presentation such as the site map linked from the "This Site" menu.

\r\n

Breadcrumbs provide users with information about where they are in a site.

', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 42, '2011-01-01 00:00:01', 0, '*'), (76, 167, 29, 53, 54, 3, 'sample-data-articles/fruit-shop-site/recipes', 'com_content', 'Recipes', 'recipes', '', '

Customers and suppliers can post their favorite recipes for fruit here.

\r\n

A good idea is to promote the use of metadata keywords to make finding other recipes for the same fruit easier.

\r\n

To see this in action, create a user assigned to the customer group and a user assigned to the suppliers group. These users will be able to create their own recipe pages and edit those pages. They will not be able to edit other users'' pages.

', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 42, '2011-12-27 12:18:25', 0, '*'), -(77, 169, 1, 133, 134, 1, 'uncategorised', 'com_users.notes', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '2011-01-01 00:00:01', 0, '*'); +(77, 169, 1, 133, 134, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '2011-01-01 00:00:01', 0, '*'); -- -- Update rgt value of root category row -- diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql index f24e5de004ece..06dfc146531e3 100644 --- a/installation/sql/sqlazure/joomla.sql +++ b/installation/sql/sqlazure/joomla.sql @@ -5464,7 +5464,7 @@ SELECT 5, 30, 1, 7, 8, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'un UNION ALL SELECT 6, 31, 1, 9, 10, 1, 'uncategorised', 'com_weblinks', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '1900-01-01 00:00:00', 0, '*' UNION ALL -SELECT 7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users.notes', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '1900-01-01 00:00:00', 0, '*'; +SELECT 7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2010-06-28 13:28:33', 0, '1900-01-01 00:00:00', 0, '*'; SET IDENTITY_INSERT #__categories OFF; @@ -6343,7 +6343,7 @@ SELECT 30, 19, 42, 43, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{"core.c UNION ALL SELECT 31, 25, 58, 59, 2, 'com_weblinks.category.6', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}' UNION ALL -SELECT 32,24,54,55,1,'com_users.notes.category.7','Uncategorised','{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' +SELECT 32,24,54,55,1,'com_users.category.7','Uncategorised','{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' UNION ALL SELECT 33,1,63,64,1,'com_finder','com_finder','{"core.admin":{"7":1},"core.manage":{"6":1}}' UNION ALL diff --git a/installation/sql/sqlazure/sample_blog.sql b/installation/sql/sqlazure/sample_blog.sql index 8dcb4d972db6b..2748fbd202065 100644 --- a/installation/sql/sqlazure/sample_blog.sql +++ b/installation/sql/sqlazure/sample_blog.sql @@ -32,7 +32,7 @@ INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (29, 7, 14, 15, 2, N'com_contact.category.4', N'Uncategorised', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'); INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (30, 19, 54, 55, 2, N'com_newsfeeds.category.5', N'Uncategorised', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'); INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (31, 25, 70, 71, 2, N'com_weblinks.category.6', N'Uncategorised', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'); -INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (32, 24, 66, 67, 1, N'com_users.notes.category.7', N'Uncategorised', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'); +INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (32, 24, 66, 67, 1, N'com_users.category.7', N'Uncategorised', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'); INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (33, 1, 77, 78, 1, N'com_finder', N'com_finder', N'{"core.admin":{"7":1},"core.manage":{"6":1}}'); INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (34, 25, 72, 73, 2, N'com_weblinks.category.8', N'Blog Roll', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'); INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (35, 8, 24, 31, 2, N'com_content.category.9', N'Blog', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'); @@ -41,7 +41,7 @@ INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (38, 35, 25, 26, 3, N'com_content.article.3', N'Welcome to your blog', N''); INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (39, 35, 27, 28, 3, N'com_content.article.4', N'About your home page', N'{"core.delete":[],"core.edit":[],"core.edit.state":[]}'); INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (40, 35, 29, 30, 3, N'com_content.article.5', N'Your Modules', N'{"core.delete":[],"core.edit":[],"core.edit.state":[]}'); -INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (41, 1, 79, 80, 1, N'com_users.notes.category.10', N'Uncategorised', N''); +INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (41, 1, 79, 80, 1, N'com_users.category.10', N'Uncategorised', N''); INSERT INTO[#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES (42, 1, 81, 82, 1, 'com_joomlaupdate', 'com_joomlaupdate', '{"core.admin":[],"core.manage":[],"core.delete":[],"core.edit.state":[]}'); SET IDENTITY_INSERT [#__assets] OFF; @@ -214,4 +214,4 @@ INSERT INTO [#__weblinks] ( [id], [catid], [sid], [title], [alias], [url], [desc (1, 8, 0, 'Joomla! Community', 'joomla-community', 'http://community.joomla.org/blogs/community.html', '', '1900-01-01T00:00:00.000', 0, 1, 0, '1900-01-01T00:00:00.000', 1, 0, 1, 1, '{"target":"","width":"","height":"","count_clicks":""}', '*', '2012-01-04 15:04:03', 42, '', '2012-01-04 16:17:27', 42, '', '', '', 0, '', '1900-01-01T00:00:00.000', '1900-01-01T00:00:00.000'); INSERT INTO [#__weblinks] ( [id], [catid], [sid], [title], [alias], [url], [description], [date], [hits], [state], [checked_out], [checked_out_time], [ordering], [archived], [approved], [access], [params], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down]) VALUES(2, 8, 0, 'Joomla! Leadership Blog', 'joomla-leadership-blog', 'http://community.joomla.org/blogs/leadership.html', '', '1900-01-01T00:00:00.000', 0, 1, 0, '1900-01-01T00:00:00.000', 2, 0, 1, 1, '{"target":"","width":"","height":"","count_clicks":""}', '*', '2012-01-04 15:04:48', 42, '', '2012-01-04 16:17:27', 42, '', '', '', 0, '', '1900-01-01T00:00:00.000', '1900-01-01T00:00:00.000'); -SET IDENTITY_INSERT [#__weblinks] OFF; \ No newline at end of file +SET IDENTITY_INSERT [#__weblinks] OFF; diff --git a/installation/sql/sqlazure/sample_brochure.sql b/installation/sql/sqlazure/sample_brochure.sql index 2c847a18f0127..58c6119da9186 100644 --- a/installation/sql/sqlazure/sample_brochure.sql +++ b/installation/sql/sqlazure/sample_brochure.sql @@ -34,7 +34,7 @@ INSERT INTO [#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [titl INSERT INTO [#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ('29', '7', '14', '15', '2', N'com_contact.catery.4', N'Uncaterised', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'); INSERT INTO [#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ('30', '19', '56', '57', '2', N'com_newsfeeds.catery.5', N'Uncaterised', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'); INSERT INTO [#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ('31', '25', '72', '73', '2', N'com_weblinks.catery.6', N'Uncaterised', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'); -INSERT INTO [#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ('32', '24', '68', '69', '1', N'com_users.notes.catery.7', N'Uncaterised', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'); +INSERT INTO [#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ('32', '24', '68', '69', '1', N'com_users.catery.7', N'Uncaterised', N'{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'); INSERT INTO [#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ('33', '1', '77', '78', '1', N'com_finder', N'com_finder', N'{"core.admin":{"7":1},"core.manage":{"6":1}}'); INSERT INTO [#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ('34', '27', '19', '20', '3', N'com_content.article.1', N'Home Page Title', N'{"core.delete":[],"core.edit":[],"core.edit.state":[]}'); INSERT INTO [#__assets] ([id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ('35', '27', '21', '22', '3', N'com_content.article.2', N'About Us', N'{"core.delete":[],"core.edit":[],"core.edit.state":[]}'); @@ -58,7 +58,7 @@ INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [leve INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [level], [path], [extension], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [hits], [language]) VALUES('4', '29', '1', '5', '6', '1', 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', '1', '0', '1900-01-01T00:00:00.000', '1', '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', '42', '2010-06-28 13:27:57',' 0', '1900-01-01T00:00:00.000', '0', '*'); INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [level], [path], [extension], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [hits], [language]) VALUES('5', '30', '1', '7', '8', '1', 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', '1', '0', '1900-01-01T00:00:00.000', '1', '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}','42', '2010-06-28 13:28:15', '0', '1900-01-01T00:00:00.000', '0', '*'); INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [level], [path], [extension], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [hits], [language]) VALUES('6', '31', '1', '9', '10', '1', 'uncategorised', 'com_weblinks', 'Uncategorised', 'uncategorised', '', '', '1', '0', '1900-01-01T00:00:00.000', '1', '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}',' 42', '2010-06-28 13:28:33',' 0', '1900-01-01T00:00:00.000', '0', '*'); -INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [level], [path], [extension], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [hits], [language]) VALUES('7', '32', '1', '11', '12', '1', 'uncategorised', 'com_users.notes', 'Uncategorised', 'uncategorised', '', '', '1', '0', '1900-01-01T00:00:00.000',' 1', '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', '42', '2010-06-28 13:28:33', '0', '1900-01-01T00:00:00.000', '0', '*'); +INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [level], [path], [extension], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [hits], [language]) VALUES('7', '32', '1', '11', '12', '1', 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', '1', '0', '1900-01-01T00:00:00.000',' 1', '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', '42', '2010-06-28 13:28:33', '0', '1900-01-01T00:00:00.000', '0', '*'); INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [level], [path], [extension], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [hits], [language]) VALUES('8', '36', '1', '13', '14', '1', 'news', 'com_content', 'News', 'news', '', '

This is the latest new from us.

\r\n

You can edit this description in the Content Category Manager.

\r\n

This will show the most recent article. You can easily change it to show more if you wish.

\r\n

The module on the left shows a list of older articles.

', '1',' 0', '1900-01-01T00:00:00.000', '1', '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', '42', '2012-01-04 03:09:08', '42', '2012-01-04 04:32:05', '0', '*'); SET IDENTITY_INSERT [#__categories] OFF; diff --git a/installation/sql/sqlazure/sample_data.sql b/installation/sql/sqlazure/sample_data.sql index c67663552f47b..08769489ec20e 100644 --- a/installation/sql/sqlazure/sample_data.sql +++ b/installation/sql/sqlazure/sample_data.sql @@ -162,7 +162,7 @@ INSERT INTO [#__assets] ( [id], [parent_id], [lft], [rgt], [level], [name], [tit INSERT INTO [#__assets] ( [id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ( '166', '47', '183', '188', '6', 'com_content.category.75', 'Navigation Modules', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'); INSERT INTO [#__assets] ( [id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ( '167', '54', '291', '292', '4', 'com_content.category.76', 'Recipes', '{"core.create":{"12":1,"10":1},"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":{"12":1,"10":1}}'); INSERT INTO [#__assets] ( [id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ( '168', '34', '106', '107', '3', 'com_content.article.67', 'What''s New in 1.5?', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'); -INSERT INTO [#__assets] ( [id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ('169', '24', '337', '338', '2', 'com_users.notes.category.77', 'Uncategorised', ''); +INSERT INTO [#__assets] ( [id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES ('169', '24', '337', '338', '2', 'com_users.category.77', 'Uncategorised', ''); INSERT INTO [#__assets] ( [id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES('170', '50', '219', '220', '6', 'com_content.article.68', 'Captcha', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'); INSERT INTO [#__assets] ( [id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES('171', '50', '221', '222', '6', 'com_content.article.69', 'Quick Icons', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'); INSERT INTO [#__assets] ( [id], [parent_id], [lft], [rgt], [level], [name], [title], [rules]) VALUES('172', '96', '178', '179',' 7', 'com_content.article.70', 'Smart Search', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'); @@ -265,7 +265,7 @@ INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [leve INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [level], [path], [extension], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [hits], [language]) VALUES ('72','108','28','44','45','4','sample-data-articles/park-site/photo-gallery/animals','com_content','Animals','animals','','','1','0','1900-01-01T00:00:00.000','1','{"target":"","image":""}','','','{"page_title":"","author":"","robots":""}','42','2011-01-01T00:00:01.000','42','2011-01-01T00:00:01.000','0','en-GB'); INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [level], [path], [extension], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [hits], [language]) VALUES ('73','109','28','46','47','4','sample-data-articles/park-site/photo-gallery/scenery','com_content','Scenery','scenery','','','1','0','1900-01-01T00:00:00.000','1','{"target":"","image":""}','','','{"page_title":"","author":"","robots":""}','42','2011-01-01T00:00:01.000','42','2011-01-01T00:00:01.000','0','en-GB'); INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [level], [path], [extension], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [hits], [language]) VALUES ('76','167','29','53','54','3','sample-data-articles/fruit-shop-site/recipes','com_content','Recipes','recipes','','

Customers and suppliers can post their favorite recipes for fruit here.

A good idea is to promote the use of metadata keywords to make finding other recipes for the same fruit easier.

To see this in action, create a user assigned to the customer group and a user assigned to the suppliers group. These users will be able to create their own recipe pages and edit those pages. They will not be able to edit other users'' pages.

','1','0','1900-01-01T00:00:00.000','1','{"category_layout":"","image":""}','','','{"author":"","robots":""}','42','2011-01-01T00:00:01.000','42','2011-12-27 12:18:25','0','*'); -INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [level], [path], [extension], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [hits], [language]) VALUES ('77','169','1','133','134','1','uncategorised','com_users.notes','Uncategorised','uncategorised','','','1','0','1900-01-01T00:00:00.000','1','{"target":"","image":""}','','','{"page_title":"","author":"","robots":""}','42','2011-01-01T00:00:01.000','0','2011-01-01T00:00:01.000','0','*'); +INSERT INTO [#__categories] ( [id], [asset_id], [parent_id], [lft], [rgt], [level], [path], [extension], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [hits], [language]) VALUES ('77','169','1','133','134','1','uncategorised','com_users','Uncategorised','uncategorised','','','1','0','1900-01-01T00:00:00.000','1','{"target":"","image":""}','','','{"page_title":"","author":"","robots":""}','42','2011-01-01T00:00:01.000','0','2011-01-01T00:00:01.000','0','*'); declare @max_rgt int SET @max_rgt = (SELECT MAX(rgt)+1 FROM #__categories WHERE id <> 1)