Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
docker
osticket
Commits
fb6cbf83
Commit
fb6cbf83
authored
7 years ago
by
Peter Rotich
Browse files
Options
Downloads
Plain Diff
Merge branch 'issue/archived+depts+topics' into develop-next
parents
4dff300a
d3a2d720
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/i18n/en_US/department.yaml
+4
-0
4 additions, 0 deletions
include/i18n/en_US/department.yaml
include/i18n/en_US/help_topic.yaml
+6
-5
6 additions, 5 deletions
include/i18n/en_US/help_topic.yaml
with
10 additions
and
5 deletions
include/i18n/en_US/department.yaml
+
4
−
0
View file @
fb6cbf83
...
...
@@ -3,6 +3,7 @@
#
# Fields:
# id - (int:optional) id number in the database
# flags - (bitmask: 0x0004 Active 0x0008 Archived)
# name - (string) Short name of the department
# signature - (string) Descriptive name of the department
#
...
...
@@ -17,6 +18,7 @@
signature
:
|
Support Department
ispublic
:
1
flags
:
0x0004
group_membership
:
1
-
id
:
2
...
...
@@ -24,6 +26,7 @@
signature
:
|
Sales and Customer Retention
ispublic
:
1
flags
:
0x0004
sla_id
:
1
group_membership
:
1
...
...
@@ -32,4 +35,5 @@
signature
:
|
Maintenance Department
ispublic
:
0
flags
:
0x0004
group_membership
:
0
This diff is collapsed.
Click to expand it.
include/i18n/en_US/help_topic.yaml
+
6
−
5
View file @
fb6cbf83
...
...
@@ -4,7 +4,7 @@
# Fields:
# id - (int:optional) id number in the database
# topic - (string) descriptive name of the help topic
#
isactive - (bool:0|1) if the help topic should be initially usable
#
flags - (bitmask: Active | Disabled | Archived)
# ispublic - (bool:0|1) true or false if end users should be able to see the
# help topic. In other words, true or false if the help topic is _not_
# for internal use only
...
...
@@ -19,7 +19,7 @@
#
---
-
topic_id
:
1
isactive
:
1
flags
:
0x02
ispublic
:
1
priority_id
:
2
forms
:
[
2
]
...
...
@@ -27,7 +27,8 @@
notes
:
|
Questions about products or services
-
isactive
:
1
-
topic_id
:
2
flags
:
0x02
ispublic
:
1
priority_id
:
1
forms
:
[
2
]
...
...
@@ -36,7 +37,7 @@
Tickets that primarily concern the sales and billing departments
-
topic_id
:
10
isactive
:
1
flags
:
0x02
ispublic
:
1
dept_id
:
3
priority_id
:
2
...
...
@@ -46,7 +47,7 @@
Product, service, or equipment related issues
-
topic_pid
:
10
isactive
:
1
flags
:
0x02
ispublic
:
1
sla_id
:
1
priority_id
:
3
...
...
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