Index: lams_common/db/model/lams_11.clay
===================================================================
diff -u -rc5b735b18679e734f8ee3446c146994ea6cb36dd -rf2b31c33e89648a7fc7b2d0a96e48cfd3f4588b0
--- lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision c5b735b18679e734f8ee3446c146994ea6cb36dd)
+++ lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision f2b31c33e89648a7fc7b2d0a96e48cfd3f4588b0)
@@ -1560,6 +1560,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3027,6 +3040,12 @@
+
+
+
+
+
+
@@ -3985,6 +4004,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4152,19 +4184,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -4828,6 +4847,12 @@
+
+
+
+
+
+
@@ -5021,8 +5046,8 @@
-
+
@@ -5034,8 +5059,8 @@
-
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r556039a870988743d7f43429fba38bcfe2d66a49 -rf2b31c33e89648a7fc7b2d0a96e48cfd3f4588b0
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 556039a870988743d7f43429fba38bcfe2d66a49)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision f2b31c33e89648a7fc7b2d0a96e48cfd3f4588b0)
@@ -220,6 +220,7 @@
, parent_organisation_id BIGINT(20)
, organisation_type_id INT(3) NOT NULL DEFAULT 0
, create_date DATETIME NOT NULL
+ , created_by BIGINT(20) NOT NULL
, workspace_id BIGINT(20)
, organisation_state_id INT(3) NOT NULL
, admin_add_new_users TINYINT(1) NOT NULL DEFAULT 0
@@ -406,6 +407,7 @@
, export_pfolio_class_url TEXT
, monitor_url TEXT
, contribute_url TEXT
+ , help_url TEXT
, create_date_time DATETIME NOT NULL
, UNIQUE UQ_systool_activity_type (learning_activity_type_id)
, PRIMARY KEY (system_tool_id)
@@ -441,6 +443,7 @@
, monitor_url TEXT
, contribute_url TEXT
, moderation_url TEXT
+ , help_url TEXT
, create_date_time DATETIME NOT NULL
, language_file VARCHAR(255)
, UNIQUE UQ_lams_tool_sig (tool_signature)
@@ -622,7 +625,6 @@
, created_date_time DATETIME NOT NULL
, next_version_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 1
, parent_nv_id BIGINT(20) UNSIGNED
- , user_id BIGINT(20)
, PRIMARY KEY (node_id)
, INDEX (workspace_id)
, CONSTRAINT FK_lams_cr_node_1 FOREIGN KEY (workspace_id)
@@ -635,6 +637,7 @@
, node_id BIGINT(20) UNSIGNED NOT NULL
, version_id BIGINT(20) UNSIGNED NOT NULL
, created_date_time DATETIME NOT NULL
+ , user_id BIGINT(20) NOT NULL
, PRIMARY KEY (nv_id)
, INDEX (node_id)
, CONSTRAINT FK_lams_cr_node_version_2 FOREIGN KEY (node_id)
Index: lams_common/db/sql/insert_users.sql
===================================================================
diff -u -rd05b4628f169a96d3bba017d348b1931e17956f0 -rf2b31c33e89648a7fc7b2d0a96e48cfd3f4588b0
--- lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision d05b4628f169a96d3bba017d348b1931e17956f0)
+++ lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision f2b31c33e89648a7fc7b2d0a96e48cfd3f4588b0)
@@ -75,20 +75,20 @@
insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (10, 8,8);
insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (11, 50,40);
-INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_id, organisation_state_id)
- VALUES (1, 'Root', null, 'Root Organisation',null,1,NOW(),1,1,1);
-INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_id, organisation_state_id)
- VALUES (2, 'Playpen', 'PP101', 'Developers Playpen',1,2,NOW(),2,1,1);
-INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_id, organisation_state_id)
- VALUES (3, 'Everybody', null, 'All People In Course',2,3,NOW(),null,1,1);
-INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_id, organisation_state_id)
- VALUES (4, 'Mathematics 1', 'MATH111', 'Mathematics 1',1,2,NOW(),3,2,1);
-INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_id, organisation_state_id)
- VALUES (5, 'Tutorial Group A', 'TUTA', 'Tutorial Group A',4,3,NOW(),null,2,1);
-INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_id, organisation_state_id)
- VALUES (6, 'Tutorial Group B', 'TUTB', 'Tutorial Group B',4,3,NOW(),null,2,1);
-INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_id, organisation_state_id)
- VALUES (7, 'Moodle', 'Moodle', 'Moodle Test',1,2,NOW(),50,1,1);
+INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id)
+ VALUES (1, 'Root', null, 'Root Organisation',null,1,NOW(),1,1,1,1);
+INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id)
+ VALUES (2, 'Playpen', 'PP101', 'Developers Playpen',1,2,NOW(),1,2,1,1);
+INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id)
+ VALUES (3, 'Everybody', null, 'All People In Course',2,3,NOW(),1,null,1,1);
+INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id)
+ VALUES (4, 'Mathematics 1', 'MATH111', 'Mathematics 1',1,2,NOW(),1,3,2,1);
+INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id)
+ VALUES (5, 'Tutorial Group A', 'TUTA', 'Tutorial Group A',4,3,NOW(),1,null,2,1);
+INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id)
+ VALUES (6, 'Tutorial Group B', 'TUTB', 'Tutorial Group B',4,3,NOW(),1,null,2,1);
+INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id)
+ VALUES (7, 'Moodle', 'Moodle', 'Moodle Test',1,2,NOW(),1,50,1,1);
-- users