Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos.core
Commits
e94068d6
Commit
e94068d6
authored
Feb 05, 2024
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "slapos_mysql_innodb_catalog: drop subscription_security_uid"
This reverts commit
4795c8db
.
parent
775341f4
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
1 deletion
+7
-1
master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.sql
...ortal_catalog/erp5_mysql_innodb/z_catalog_object_list.sql
+2
-1
master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml
...ortal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml
+1
-0
master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.sql
...tem/portal_catalog/erp5_mysql_innodb/z_create_catalog.sql
+2
-0
master/bt5/slapos_mysql_innodb_catalog/CatalogSecurityUidColumnTemplateItem/security_uid_column_list.xml
...ecurityUidColumnTemplateItem/security_uid_column_list.xml
+1
-0
master/bt5/slapos_mysql_innodb_catalog/bt/template_catalog_security_uid_column_list
...nodb_catalog/bt/template_catalog_security_uid_column_list
+1
-0
No files found.
master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.sql
View file @
e94068d6
REPLACE
INTO
catalog
(
`uid`
,
`security_uid`
,
`function_security_uid`
,
`group_security_uid`
,
`shadow_security_uid`
,
`computer_security_uid`
,
`user_security_uid`
,
(
`uid`
,
`security_uid`
,
`function_security_uid`
,
`group_security_uid`
,
`shadow_security_uid`
,
`computer_security_uid`
,
`user_security_uid`
,
`subscription_security_uid`
,
`project_security_uid`
,
`owner`
,
`viewable_owner`
,
`path`
,
`relative_url`
,
`parent_uid`
,
`id`
,
`description`
,
`title`
,
`meta_type`
,
`portal_type`
,
`opportunity_state`
,
`corporate_registration_code`
,
`ean13_code`
,
`validation_state`
,
`simulation_state`
,
`causality_state`
,
`invoice_state`
,
`payment_state`
,
`event_state`
,
`immobilisation_state`
,
`reference`
,
`grouping_reference`
,
`grouping_date`
,
...
...
@@ -16,6 +16,7 @@ VALUES
<
dtml
-
sqlvar
expr
=
"shadow_security_uid[loop_item]"
type
=
"int"
optional
>
,
<
dtml
-
sqlvar
expr
=
"computer_security_uid[loop_item]"
type
=
"int"
optional
>
,
<
dtml
-
sqlvar
expr
=
"user_security_uid[loop_item]"
type
=
"int"
optional
>
,
<
dtml
-
sqlvar
expr
=
"subscription_security_uid[loop_item]"
type
=
"int"
optional
>
,
<
dtml
-
sqlvar
expr
=
"project_security_uid[loop_item]"
type
=
"int"
optional
>
,
<
dtml
-
sqlvar
expr
=
"getOwnerInfo[loop_item]['id']"
type
=
"string"
>
,
<
dtml
-
sqlvar
expr
=
"(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or ''"
type
=
"string"
optional
>
,
...
...
master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml
View file @
e94068d6
...
...
@@ -19,6 +19,7 @@ group_security_uid\n
shadow_security_uid\n
computer_security_uid\n
user_security_uid\n
subscription_security_uid\n
project_security_uid\n
getOwnerInfo\n
getViewPermissionOwner\n
...
...
master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.sql
View file @
e94068d6
...
...
@@ -10,6 +10,7 @@ CREATE TABLE `catalog` (
`shadow_security_uid`
INT
UNSIGNED
,
`computer_security_uid`
INT
UNSIGNED
,
`user_security_uid`
INT
UNSIGNED
,
`subscription_security_uid`
INT
UNSIGNED
,
`project_security_uid`
INT
UNSIGNED
,
`owner`
varbinary
(
255
)
NOT
NULL
default
''
,
`viewable_owner`
varbinary
(
255
)
NOT
NULL
default
''
,
...
...
@@ -49,6 +50,7 @@ CREATE TABLE `catalog` (
KEY
`shadow_security_uid`
(
`shadow_security_uid`
),
KEY
`computer_security_uid`
(
`computer_security_uid`
),
KEY
`user_security_uid`
(
`user_security_uid`
),
KEY
`subscription_security_uid`
(
`subscription_security_uid`
),
KEY
`owner`
(
`owner`
),
KEY
`viewable_owner`
(
`viewable_owner`
),
KEY
`Parent`
(
`parent_uid`
),
...
...
master/bt5/slapos_mysql_innodb_catalog/CatalogSecurityUidColumnTemplateItem/security_uid_column_list.xml
View file @
e94068d6
...
...
@@ -4,5 +4,6 @@
<key>
group | group_security_uid
</key>
<key>
project | project_security_uid
</key>
<key>
shadow | shadow_security_uid
</key>
<key>
subscription | subscription_security_uid
</key>
<key>
user | user_security_uid
</key>
</key_list>
\ No newline at end of file
master/bt5/slapos_mysql_innodb_catalog/bt/template_catalog_security_uid_column_list
View file @
e94068d6
...
...
@@ -3,4 +3,5 @@ group | group_security_uid
shadow | shadow_security_uid
computer | computer_security_uid
user | user_security_uid
subscription | subscription_security_uid
project | project_security_uid
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment