Skip to content
This repository was archived by the owner on Nov 2, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
f40a7b1
Update SQL Scripts for Postgresql and MySQL
khu5h1 Jul 22, 2022
a6a3fd7
Deleted one update sql script for Postgresql
khu5h1 Jul 22, 2022
471a493
Removed Label from Hidden Field
khu5h1 Jul 22, 2022
e8cbf13
Code cleanup
khu5h1 Jul 24, 2022
6128b26
Update String Value for Relative URL
khu5h1 Jul 30, 2022
b3e25bd
Added extra lines in the end
khu5h1 Jul 30, 2022
8704ab4
Increase the file version to 4.3 for Update SQL Scripts for Postgres…
khu5h1 Jul 30, 2022
697e7ad
Deleted 4.2 update sql script for Postgresql and Mysql
khu5h1 Jul 30, 2022
f149b4b
Code Cleanup
khu5h1 Jul 30, 2022
b639b31
Merge branch 'infra-guided-tour' of https://github.com/joomla-project…
khu5h1 Aug 2, 2022
ec84033
Code Cleanup
khu5h1 Aug 2, 2022
ea8b5a3
Update drone signature for tests
bembelimen Aug 2, 2022
638bda3
Merge branch 'dev' of https://github.com/joomla-projects/gsoc22_guide…
khu5h1 Aug 2, 2022
51a02ad
Cleanup
khu5h1 Aug 2, 2022
61ba835
Resolved Warnings and followed coding standards for tests
khu5h1 Aug 2, 2022
2797a97
Resolved Warning for Test
khu5h1 Aug 2, 2022
fc92d7e
Added comment for PHPCS error
khu5h1 Aug 2, 2022
f445336
Used Standard Headings for the Views and removed the tours id from th…
khu5h1 Aug 3, 2022
1908dbd
String value changes for tour and steps
khu5h1 Aug 4, 2022
ab4008a
Code cleanup
khu5h1 Aug 4, 2022
ff06055
Used shorthand
khu5h1 Aug 4, 2022
dcd0238
Fixed Indentation of (C)
khu5h1 Aug 4, 2022
83581b7
Fixed Indentation of step.xml
khu5h1 Aug 4, 2022
e9aa38e
Code cleanup
khu5h1 Aug 4, 2022
1333d8b
Used Language Strings
khu5h1 Aug 5, 2022
5c3c289
Cleanup in step.xml and tour.xml
khu5h1 Aug 5, 2022
586fc95
Removed Overlay Option and made it permanently true for every tour
khu5h1 Aug 5, 2022
c56358f
Cleanup
khu5h1 Aug 5, 2022
b62ac97
PHPCS Fixes
khu5h1 Aug 5, 2022
75e4b5f
Cleanup for tour.xml
khu5h1 Aug 6, 2022
36bfc29
Removed unused index for Postgresql
khu5h1 Aug 6, 2022
b430b8a
Added link of tour on steps view URL
khu5h1 Aug 10, 2022
bb3309e
Fixed the filtering of steps according to particular tour
khu5h1 Aug 10, 2022
b2acb79
Fix assets table changes in base.sql
richard67 Aug 13, 2022
c1476f6
Adapt next asset id sequence number for PostgreSQL
richard67 Aug 13, 2022
b17c1fc
Add missing values to insert for PostgreSQL
richard67 Aug 13, 2022
de1336d
Don't use not existing asset id 91 on updates
richard67 Aug 13, 2022
f539ed1
Use INSERT IGNORE / ON CONFLICT DO NOTHING on updates
richard67 Aug 13, 2022
8f5db62
Update sequence numbers on PostgreSQL
richard67 Aug 13, 2022
586d90f
Consistency and code style fixes
richard67 Aug 13, 2022
1f86bed
Add missing extension record
richard67 Aug 13, 2022
1632e40
Fix checked out columns to allow null values
richard67 Aug 13, 2022
fee4177
Correct data types in PostgreSQL
richard67 Aug 13, 2022
2171c9b
Add CAN FAIL installer hint for PostgreSQL
richard67 Aug 13, 2022
d785720
Fix for PostgreSQL
richard67 Aug 13, 2022
1e41ab9
Fix extensions.sql for PostgreSQL
richard67 Aug 13, 2022
2d7652e
Use correct values for created, modified and checked out columns
richard67 Aug 13, 2022
a75a5f0
Fix my error from previous commit
richard67 Aug 13, 2022
ff39443
Another invalid data type for PostgreSQL
richard67 Aug 13, 2022
b06deb9
Fix names quoting
richard67 Aug 13, 2022
d376f86
Use double quotes inside SQL strings
richard67 Aug 13, 2022
e1d131f
Fix checked out column for PostgreSQL, too
richard67 Aug 13, 2022
ebedea3
Fix checked out columns in MySQL update SQL script
richard67 Aug 13, 2022
2c2c794
Add null value support to table classes
richard67 Aug 13, 2022
34a6f5b
Remoce copy and paste remainders
richard67 Aug 13, 2022
fd748cf
SQL code style: Reserved words uppercase
richard67 Aug 13, 2022
a39b1a9
Add PHPCS exception for underscore
richard67 Aug 13, 2022
a4194d9
Checked out for steps table
richard67 Aug 13, 2022
9c2b001
Add new core extensions to extensions helper
richard67 Aug 13, 2022
9cfdfc0
Fix for the database checker
richard67 Aug 14, 2022
35f806b
Adapt code style for some tables to the others
richard67 Aug 14, 2022
8e96dab
Added link of tour on steps view URL
khu5h1 Aug 18, 2022
d381c4e
Merge branch 'cleanup' of https://github.com/joomla-projects/gsoc22_g…
khu5h1 Sep 4, 2022
2cc268b
Sync up changes with clean up branch
khu5h1 Sep 4, 2022
2e6c962
Merge pull request #10 from richard67/cleanup-fix-sql-2022-08-13
khu5h1 Sep 24, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
-- Add `com_guidedtours` to `#__extensions`
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`) VALUES
(0, 'com_guidedtours', 'component', 'com_guidedtours', '', 1, 1, 0, 0, 1, '', '{}', '');

-- Add `plg_system_tour` to `#__extensions`
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
(0, 'plg_system_tour', 'plugin', 'tour', 'system', 0, 1, 1, 0, 0, '', '{}', '', 15, 0);

--
-- Increase the size of the htmlbody field in the #__mail_templates table
--
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
--
-- Table structure for table `#__guidedtours`
--

CREATE TABLE IF NOT EXISTS `#__guidedtours` (
`id` int NOT NULL AUTO_INCREMENT,
`asset_id` int DEFAULT 0,
`title` varchar(255) NOT NULL,
`description` text NOT NULL,
`ordering` int NOT NULL DEFAULT 0,
`extensions` text NOT NULL,
`url` varchar(255) NOT NULL,
`overlay` tinyint NOT NULL DEFAULT 0,
`created` datetime NOT NULL,
`created_by` int NOT NULL DEFAULT 0,
`modified` datetime NOT NULL,
`modified_by` int NOT NULL DEFAULT 0,
`checked_out_time` datetime NOT NULL,
`checked_out` int NOT NULL DEFAULT 0,
`published` tinyint NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

--
-- Dumping data for table `#__guidedtours`
--

INSERT INTO `#__guidedtours` (`id`, `asset_id`, `title`,`description`, `ordering`, `extensions`, `url`,`overlay`, `created`, `created_by`, `modified`, `modified_by`, `checked_out_time`, `checked_out`, `published`) VALUES
(1, 91, 'How to create a Guided Tour in Joomla Backend?', '<p>This Tour will show you that how you can create Guided Tour in Joomla Backend!</p>', 0, '[\"com_guidedtours\"]', 'administrator/index.php?option=com_guidedtours&view=tours', 1, '', 0, '', 0, '', 0, 1);

-- --------------------------------------------------------

--
-- Table structure for table `#__guidedtour_steps`
--

CREATE TABLE IF NOT EXISTS `#__guidedtour_steps` (
`id` int NOT NULL AUTO_INCREMENT PRIMARY KEY,
`tour_id` int NOT NULL DEFAULT 0,
`title` varchar(255) NOT NULL,
`published` tinyint NOT NULL DEFAULT 0,
`description` text NOT NULL,
`ordering` int NOT NULL DEFAULT 0,
`step-no` int NOT NULL DEFAULT 0,
`position` varchar(255) NOT NULL,
`target` varchar(255) NOT NULL,
`url` varchar(255) NOT NULL,
`created` datetime NOT NULL,
`created_by` int unsigned NOT NULL DEFAULT 0,
`modified` datetime NOT NULL,
`modified_by` int unsigned NOT NULL DEFAULT 0,
KEY `idx_tour` (`tour_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

--
-- Dumping data for table `#__guidedtour_steps`
--

INSERT INTO `#__guidedtour_steps` (`id`, `tour_id`, `title`, `published`, `description`, `ordering`, `step-no`, `position`, `target` ,`url` , `created`, `created_by`, `modified`, `modified_by`) VALUES
(1, 1, 'Click here!', 1, '<p>This Tour will show you that how you can create a new Guided Tour in Joomla! Backend</p>', 0, 1, 'bottom', '.button-new','administrator/index.php?option=com_guidedtours&view=tours' ,'', 430, '', 430),
(2, 1, 'Add title for your Tour', 1, '<p>Here you have to add the title of your Tour Step. </p>', 0, 1, 'bottom', '#jform_title', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit','', 430, '', 430),
(3, 1, 'Add Content', 1, '<p>Add the content of your Tour here!</p>', 0, 1, 'bottom', '#details','administrator/index.php?option=com_guidedtours&view=tour&layout=edit' ,'', 430, '', 430),
(4, 1, 'Plugin selector', 1, '<p>Select the extensions where you want to show your Tour. e.g If you are creating a tour which is only in \'Users\' extensions then select Users here.</p>', 0, 1, 'bottom', '.choices__inner', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit','', 430, '', 430),
(5, 1, 'URL', 1, '<p>Add Relative URL of the page from where you want to start your Tour. </p>', 0, 1, 'bottom', '#jform_url', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit','', 430, '', 430),
(6, 1, 'Overlay', 1, '<p>Select if you want an overlay effect or not.</p>', 0, 1, 'bottom', '#jform_overlay1','administrator/index.php?option=com_guidedtours&view=tour&layout=edit' ,'', 430, '', 430),
(7, 1, 'Save and Close', 1, '<p>Save and close the tour</p>', 0, 1, 'bottom', '#save-group-children-save','administrator/index.php?option=com_guidedtours&view=tour&layout=edit' ,'', 430, '', 430),
(8, 1, 'Create steps for your Tour', 1, '<p>Click on steps icon in the right</p>', 0, 1, 'right', '.btn-info','administrator/index.php?option=com_guidedtours&view=tours' ,'', 430, '', 430),
(9, 1, 'Click here!', 1, '<p>Click here to create a new Step for your Tour</p>', 0, 1, 'bottom', '.button-new', 'administrator/index.php?option=com_guidedtours&view=steps&tour_id=1','', 430, '', 430),
(10, 1, 'Add title for your Tour.', 1, '<p>Here you have to add the title of your Tour Step. </p>', 0, 1, 'bottom', '#jform_title','administrator/index.php?option=com_guidedtours&view=step&layout=edit' ,'', 430, '', 430),
(11, 1, 'Add Content', 1, '<p>Add the content of your Tour here!</p>', 0, 1, 'bottom', '#details', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430),
(12, 1, 'Position ', 1, '<p>Add the position of the Step you want. e.g. Right, Left, Top, Bottom.</p>', 0, 1, 'bottom', '#jform_position','administrator/index.php?option=com_guidedtours&view=step&layout=edit' ,'', 430, '', 430),
(13, 1, 'Target', 1, '<p>Add the ID name or Class name of the element where you want to attach your Tour.</p>', 0, 1, 'bottom', '#jform_target', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430),
(14, 1, 'Multi-page URL', 1, '<p>Add Relative URL of the page from where next step starts</p>', 0, 1, 'bottom', '#jform_url','administrator/index.php?option=com_guidedtours&view=step&layout=edit' ,'', 430, '', 430),
(15, 1, 'Save and Close', 1, '<p>Save and close the step</p>', 0, 1, 'bottom', '#save-group-children-save', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430),
(16, 1, 'Congratulations!!!', 1, '<p>You successfully created your first Guided Tour!</p>', 0, 1, 'bottom', '', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430);

-- Add `com_guidedtours` to `#__extensions`
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`) VALUES
(0, 'com_guidedtours', 'component', 'com_guidedtours', '', 1, 1, 0, 0, 1, '', '{}', '');

-- Add `plg_system_tour` to `#__extensions`
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
(0, 'plg_system_tour', 'plugin', 'tour', 'system', 0, 1, 1, 0, 0, '', '{}', '', 15, 0);

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
--
-- Table structure for table `#__guidedtours`
--

CREATE TABLE IF NOT EXISTS "#__guidedtours"
(
"id" int NOT NULL AUTO_INCREMENT,
"asset_id" int DEFAULT 0,
"title" varchar(255) NOT NULL,
"description" text NOT NULL,
"ordering" int NOT NULL DEFAULT 0,
"extensions" text NOT NULL,
"url" varchar(255) NOT NULL,
"overlay" tinyint NOT NULL DEFAULT 0,
"created" datetime NOT NULL,
"created_by" int NOT NULL DEFAULT 0,
"modified" datetime NOT NULL,
"modified_by" int NOT NULL DEFAULT 0,
"checked_out_time" datetime NOT NULL,
"checked_out" int NOT NULL DEFAULT 0,
"published" tinyint NOT NULL DEFAULT 0,
"state" tinyint NOT NULL DEFAULT '1',
PRIMARY KEY ("id")
);

CREATE INDEX "#__guidedtours_idx_asset_id" ON "#__guidedtours" ("asset_id");
CREATE INDEX "#__guidedtours_idx_title" ON "#__guidedtours" ("title"(191));
CREATE INDEX "#__guidedtours_idx_created" ON "#__guidedtours" ("created");
CREATE INDEX "#__guidedtours_idx_created_by" ON "#__guidedtours" ("created_by");
CREATE INDEX "#__guidedtours_idx_modified" ON "#__guidedtours" ("modified");
CREATE INDEX "#__guidedtours_idx_modified_by" ON "#__guidedtours" ("modified_by");
CREATE INDEX "#__guidedtours_idx_checked_out" ON "#__guidedtours" ("checked_out");

--
-- Dumping data for table `#__guidedtours`
--

INSERT INTO "#__guidedtours" ("id", "asset_id", "title", "description", "ordering", "extensions", "url", "overlay", "created", "created_by", "modified", "modified_by", "checked_out_time", "checked_out", "published") VALUES
(1, 91, 'How to create a Guided Tour in Joomla Backend?', '<p>This Tour will show you that how you can create Guided Tour in Joomla Backend!</p>', 0, '[\"com_guidedtours\"]', 'administrator/index.php?option=com_guidedtours&view=tours', 1, '', 0, '', 0, '', 0, 1);

-- --------------------------------------------------------

--
-- Table structure for table `#__guidedtour_steps`
--

CREATE TABLE IF NOT EXISTS "#__guidedtour_steps"
(
"id" int NOT NULL AUTO_INCREMENT PRIMARY KEY,
"tour_id" int NOT NULL DEFAULT 0,
"title" varchar(255) NOT NULL,
"published" tinyint NOT NULL DEFAULT 0,
"description" text NOT NULL,
"ordering" int NOT NULL DEFAULT 0,
"step-no" int NOT NULL DEFAULT 0,
"position" varchar(255) NOT NULL,
"target" varchar(255) NOT NULL,
"url" varchar(255) NOT NULL,
"created" datetime NOT NULL,
"created_by" int unsigned NOT NULL DEFAULT 0,
"modified" datetime NOT NULL,
"modified_by" int unsigned NOT NULL DEFAULT 0,
"state" tinyint NOT NULL DEFAULT '1'
);
CREATE INDEX "#__guidedtours_idx_tour_id" ON "#__guidedtour_steps" ("tour_id");

--
-- Dumping data for table `#__guidedtour_steps`
--

INSERT INTO "#__guidedtour_steps" ("id", "tour_id", "title", "published", "description", "ordering", "step-no", "position", "target", "url", "created", "created_by", "modified", "modified_by") VALUES
(1, 1, 'Click here!', 1, '<p>This Tour will show you that how you can create a new Guided Tour in Joomla! Backend</p>', 0, 1, 'bottom', '.button-new','administrator/index.php?option=com_guidedtours&view=tours' ,'', 430, '', 430),
(2, 1, 'Add title for your Tour', 1, '<p>Here you have to add the title of your Tour Step. </p>', 0, 1, 'bottom', '#jform_title', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit','', 430, '', 430),
(3, 1, 'Add Content', 1, '<p>Add the content of your Tour here!</p>', 0, 1, 'bottom', '#details','administrator/index.php?option=com_guidedtours&view=tour&layout=edit' ,'', 430, '', 430),
(4, 1, 'Plugin selector', 1, '<p>Select the extensions where you want to show your Tour. e.g If you are creating a tour which is only in \'Users\' extensions then select Users here.</p>', 0, 1, 'bottom', '.choices__inner', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit','', 430, '', 430),
(5, 1, 'URL', 1, '<p>Add Relative URL of the page from where you want to start your Tour. </p>', 0, 1, 'bottom', '#jform_url', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit','', 430, '', 430),
(6, 1, 'Overlay', 1, '<p>Select if you want an overlay effect or not.</p>', 0, 1, 'bottom', '#jform_overlay1','administrator/index.php?option=com_guidedtours&view=tour&layout=edit' ,'', 430, '', 430),
(7, 1, 'Save and Close', 1, '<p>Save and close the tour</p>', 0, 1, 'bottom', '#save-group-children-save','administrator/index.php?option=com_guidedtours&view=tour&layout=edit' ,'', 430, '', 430),
(8, 1, 'Create steps for your Tour', 1, '<p>Click on steps icon in the right</p>', 0, 1, 'right', '.btn-info','administrator/index.php?option=com_guidedtours&view=tours' ,'', 430, '', 430),
(9, 1, 'Click here!', 1, '<p>Click here to create a new Step for your Tour</p>', 0, 1, 'bottom', '.button-new', 'administrator/index.php?option=com_guidedtours&view=steps&tour_id=1','', 430, '', 430),
(10, 1, 'Add title for your Tour.', 1, '<p>Here you have to add the title of your Tour Step. </p>', 0, 1, 'bottom', '#jform_title','administrator/index.php?option=com_guidedtours&view=step&layout=edit' ,'', 430, '', 430),
(11, 1, 'Add Content', 1, '<p>Add the content of your Tour here!</p>', 0, 1, 'bottom', '#details', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430),
(12, 1, 'Position ', 1, '<p>Add the position of the Step you want. e.g. Right, Left, Top, Bottom.</p>', 0, 1, 'bottom', '#jform_position','administrator/index.php?option=com_guidedtours&view=step&layout=edit' ,'', 430, '', 430),
(13, 1, 'Target', 1, '<p>Add the ID name or Class name of the element where you want to attach your Tour.</p>', 0, 1, 'bottom', '#jform_target', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430),
(14, 1, 'Multi-page URL', 1, '<p>Add Relative URL of the page from where next step starts</p>', 0, 1, 'bottom', '#jform_url','administrator/index.php?option=com_guidedtours&view=step&layout=edit' ,'', 430, '', 430),
(15, 1, 'Save and Close', 1, '<p>Save and close the step</p>', 0, 1, 'bottom', '#save-group-children-save', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430),
(16, 1, 'Congratulations!!!', 1, '<p>You successfully created your first Guided Tour!</p>', 0, 1, 'bottom', '', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430);

-- Add `com_guidedtours` to `#__extensions`
INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data") VALUES
(0, 'com_guidedtours', 'component', 'com_guidedtours', '', 1, 1, 1, 0, 1, '', '', '');

-- Add `plg_system_tour` to `#__extensions`
INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
(0, 'plg_system_tour', 'plugin', 'Guided Tours Plugin', 'system', 0, 1, 1, 0, 0, '', '{}', '', 15, 0);
1 change: 0 additions & 1 deletion administrator/components/com_guidedtours/forms/step.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
name="asset_id"
type="hidden"
filter="unset"
label="JFIELD_ASSET_ID_LABEL"
/>

<field
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_guidedtours/forms/tour.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
name="asset_id"
type="hidden"
filter="unset"
label="JFIELD_ASSET_ID_LABEL"
/>

<field
Expand Down
Loading