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
0
Merge Requests
0
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
Thomas Gambier
slapos.core
Commits
dfbd4bc4
Commit
dfbd4bc4
authored
Feb 05, 2024
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_mysql_innodb_catalog: drop organisation_security_uid
parent
629b217c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
6 deletions
+1
-6
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
+1
-2
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
+0
-1
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
+0
-1
master/bt5/slapos_mysql_innodb_catalog/CatalogSecurityUidColumnTemplateItem/security_uid_column_list.xml
...ecurityUidColumnTemplateItem/security_uid_column_list.xml
+0
-1
master/bt5/slapos_mysql_innodb_catalog/bt/template_catalog_security_uid_column_list
...nodb_catalog/bt/template_catalog_security_uid_column_list
+0
-1
No files found.
master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.sql
View file @
dfbd4bc4
REPLACE
INTO
REPLACE
INTO
catalog
catalog
(
`uid`
,
`security_uid`
,
`function_security_uid`
,
`group_security_uid`
,
`shadow_security_uid`
,
`computer_security_uid`
,
`user_security_uid`
,
`subscription_security_uid`
,
`organisation_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`
,
`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`
,
`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`
,
`causality_state`
,
`invoice_state`
,
`payment_state`
,
`event_state`
,
`immobilisation_state`
,
`reference`
,
`grouping_reference`
,
`grouping_date`
,
...
@@ -17,7 +17,6 @@ VALUES
...
@@ -17,7 +17,6 @@ VALUES
<
dtml
-
sqlvar
expr
=
"computer_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
=
"user_security_uid[loop_item]"
type
=
"int"
optional
>
,
<
dtml
-
sqlvar
expr
=
"subscription_security_uid[loop_item]"
type
=
"int"
optional
>
,
<
dtml
-
sqlvar
expr
=
"subscription_security_uid[loop_item]"
type
=
"int"
optional
>
,
<
dtml
-
sqlvar
expr
=
"organisation_security_uid[loop_item]"
type
=
"int"
optional
>
,
<
dtml
-
sqlvar
expr
=
"project_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
=
"getOwnerInfo[loop_item]['id']"
type
=
"string"
>
,
<
dtml
-
sqlvar
expr
=
"(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or ''"
type
=
"string"
optional
>
,
<
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 @
dfbd4bc4
...
@@ -20,7 +20,6 @@ shadow_security_uid\n
...
@@ -20,7 +20,6 @@ shadow_security_uid\n
computer_security_uid\n
computer_security_uid\n
user_security_uid\n
user_security_uid\n
subscription_security_uid\n
subscription_security_uid\n
organisation_security_uid\n
project_security_uid\n
project_security_uid\n
getOwnerInfo\n
getOwnerInfo\n
getViewPermissionOwner\n
getViewPermissionOwner\n
...
...
master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.sql
View file @
dfbd4bc4
...
@@ -11,7 +11,6 @@ CREATE TABLE `catalog` (
...
@@ -11,7 +11,6 @@ CREATE TABLE `catalog` (
`computer_security_uid`
INT
UNSIGNED
,
`computer_security_uid`
INT
UNSIGNED
,
`user_security_uid`
INT
UNSIGNED
,
`user_security_uid`
INT
UNSIGNED
,
`subscription_security_uid`
INT
UNSIGNED
,
`subscription_security_uid`
INT
UNSIGNED
,
`organisation_security_uid`
INT
UNSIGNED
,
`project_security_uid`
INT
UNSIGNED
,
`project_security_uid`
INT
UNSIGNED
,
`owner`
varbinary
(
255
)
NOT
NULL
default
''
,
`owner`
varbinary
(
255
)
NOT
NULL
default
''
,
`viewable_owner`
varbinary
(
255
)
NOT
NULL
default
''
,
`viewable_owner`
varbinary
(
255
)
NOT
NULL
default
''
,
...
...
master/bt5/slapos_mysql_innodb_catalog/CatalogSecurityUidColumnTemplateItem/security_uid_column_list.xml
View file @
dfbd4bc4
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
<key>
computer | computer_security_uid
</key>
<key>
computer | computer_security_uid
</key>
<key>
function | function_security_uid
</key>
<key>
function | function_security_uid
</key>
<key>
group | group_security_uid
</key>
<key>
group | group_security_uid
</key>
<key>
organisation | organisation_security_uid
</key>
<key>
project | project_security_uid
</key>
<key>
project | project_security_uid
</key>
<key>
shadow | shadow_security_uid
</key>
<key>
shadow | shadow_security_uid
</key>
<key>
subscription | subscription_security_uid
</key>
<key>
subscription | subscription_security_uid
</key>
...
...
master/bt5/slapos_mysql_innodb_catalog/bt/template_catalog_security_uid_column_list
View file @
dfbd4bc4
...
@@ -4,5 +4,4 @@ shadow | shadow_security_uid
...
@@ -4,5 +4,4 @@ shadow | shadow_security_uid
computer | computer_security_uid
computer | computer_security_uid
user | user_security_uid
user | user_security_uid
subscription | subscription_security_uid
subscription | subscription_security_uid
organisation | organisation_security_uid
project | project_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