Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MySchoolday
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TheDutchProgrammers
MySchoolday
Commits
e8d5945e
Commit
e8d5945e
authored
3 years ago
by
Miniontoby
✍🏻
Browse files
Options
Downloads
Patches
Plain Diff
Fixed some extra stuff because MERGE
parent
ac05bf71
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
myschoolday.sql
+0
-19
0 additions, 19 deletions
myschoolday.sql
with
0 additions
and
19 deletions
myschoolday.sql
+
0
−
19
View file @
e8d5945e
...
...
@@ -87,7 +87,6 @@ ALTER TABLE `permissions` ADD PRIMARY KEY (`perm_id`), ADD KEY `perm_mod` (`perm
ALTER
TABLE
`permissions`
MODIFY
`perm_id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
;
INSERT
INTO
`permissions`
(
`perm_id`
,
`perm_mod`
,
`perm_desc`
)
VALUES
<<<<<<<
HEAD
(
1
,
'SCH'
,
'Access schools'
),
(
2
,
'SCH'
,
'Create new schools'
),
(
3
,
'SCH'
,
'Update schools'
),
...
...
@@ -103,24 +102,6 @@ INSERT INTO `permissions` (`perm_id`, `perm_mod`, `perm_desc`) VALUES
(
13
,
'HMWRK'
,
'Update homework'
),
(
14
,
'HMWRK'
,
'Delete homework'
),
(
15
,
'STDNT'
,
'See homework'
);
=======
(
1
,
'SCH'
,
'Access schools'
),
(
2
,
'SCH'
,
'Create new schools'
),
(
3
,
'SCH'
,
'Update schools'
),
(
4
,
'SCH'
,
'Delete schools'
),
(
5
,
'USR'
,
'Access users'
),
(
6
,
'USR'
,
'Create new users'
),
(
7
,
'USR'
,
'Update users'
),
(
8
,
'USR'
,
'Delete users'
),
(
9
,
'ROSTER'
,
'Create new roster'
),
(
10
,
'ROSTER'
,
'Update roster'
),
(
11
,
'ROSTER'
,
'Delete roster'
),
(
12
,
'HMWRK'
,
'Create new homework'
),
(
13
,
'HMEWRK'
,
'Update homework'
),
(
14
,
'HMEWRK'
,
'Delete homework'
),
(
15
,
'STDNT'
,
'See homework'
);
>>>>>>>
70
cf2ad1a63cd3135ca5065ac0cc569a19485e42
--
-- Tabelstructuur voor tabel `roles_permissions`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment