Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
W
website
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
84
Issues
84
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
1
Merge Requests
1
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Video AG Infrastruktur
website
Commits
ca71e995
Commit
ca71e995
authored
Jul 26, 2018
by
Julian Rother
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added stream_settings field
parent
cebdf37a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
11 deletions
+18
-11
db_schema.sql
db_schema.sql
+2
-1
edit.py
edit.py
+3
-1
templates/course.html
templates/course.html
+12
-8
templates/macros.html
templates/macros.html
+1
-1
No files found.
db_schema.sql
View file @
ca71e995
...
...
@@ -107,7 +107,8 @@ CREATE TABLE IF NOT EXISTS `lectures_data` (
`titlefile`
varchar
(
255
)
NOT
NULL
DEFAULT
''
,
`live`
INTEGER
NOT
NULL
DEFAULT
0
,
`norecording`
INTEGER
NOT
NULL
DEFAULT
0
,
`profile`
varchar
(
64
)
`profile`
varchar
(
64
),
`stream_settings`
text
NOT
NULL
DEFAULT
''
);
CREATE
TABLE
IF
NOT
EXISTS
`places`
(
`place`
varchar
(
20
)
NOT
NULL
PRIMARY
KEY
,
...
...
edit.py
View file @
ca71e995
...
...
@@ -45,7 +45,9 @@ editable_tables = {
'jumplist'
:
{
'type'
:
''
},
'deleted'
:
{
'type'
:
'boolean'
},
'live'
:
{
'type'
:
'boolean'
,
'description'
:
'Ist ein Livestream geplant? Muss gesetzt sein damit der RTMP Stream zugeordnet wird.'
},
'norecording'
:
{
'type'
:
'boolean'
,
'description:'
:
'Führt dazu, dass der Termin ausgegraut wird.'
}},
'norecording'
:
{
'type'
:
'boolean'
,
'description:'
:
'Führt dazu, dass der Termin ausgegraut wird.'
},
'stream_settings'
:
{
'type'
:
'text'
}
},
'creationtime_fields'
:
[
'course_id'
,
'time_created'
,
'time_updated'
]
},
'videos'
:
{
'table'
:
'videos_data'
,
...
...
templates/course.html
View file @
ca71e995
...
...
@@ -223,10 +223,9 @@ function editstream_dump() {
$
(
"
#editstream select[name!='']
"
).
each
(
function
()
{
res
[
$
(
this
).
attr
(
'
name
'
)]
=
$
(
this
).
val
();
});
return
JSON
.
stringify
(
res
)
;
return
res
;
};
function
editstream_load
(
data
)
{
var
obj
=
JSON
.
parse
(
data
);
function
editstream_load
(
obj
)
{
$
(
"
#editstream input:checkbox[name!='']
"
).
each
(
function
()
{
if
(
$
(
this
).
attr
(
'
name
'
)
in
obj
)
$
(
this
).
prop
(
'
checked
'
,
obj
[
$
(
this
).
attr
(
'
name
'
)]);
...
...
@@ -238,13 +237,18 @@ function editstream_load(data) {
};
$
(
'
#editstream .source-select
'
).
on
(
'
change
'
,
editstream_update
);
$
(
'
#editstream-submit
'
).
on
(
'
click
'
,
function
()
{
var
tmp
=
editstream_dump
();
console
.
log
(
tmp
);
moderator
.
api
.
set
(
$
(
'
#editstream
'
).
data
(
'
currentpath
'
),
JSON
.
stringify
(
editstream_dump
()),
true
);
$
(
'
#editstream
'
).
modal
(
'
hide
'
);
});
$
(
'
#editstream
'
).
on
(
'
show.bs.modal
'
,
function
(
event
)
{
var
button
=
$
(
event
.
relatedTarget
);
$
(
'
#editstream
'
).
data
(
'
currentpath
'
,
button
.
data
(
'
path
'
));
$
(
"
#editstream-form
"
)[
0
].
reset
();
console
.
log
(
editstream_dump
());
editstream_load
(
tmp
);
console
.
log
(
editstream_dump
()
);
if
(
button
.
data
(
'
value
'
))
editstream_load
(
button
.
data
(
'
value
'
)
);
editstream_update
(
);
});
$
(
'
#responsible-select
'
).
multiselect
({
enableCaseInsensitiveFiltering
:
true
,
maxHeight
:
200
,
numberDisplayed
:
5
,
nonSelectedText
:
'
Niemand
'
,
nSelectedText
:
'
ausgewählt
'
,
allSelectedText
:
false
,
...
...
templates/macros.html
View file @
ca71e995
...
...
@@ -262,7 +262,7 @@ $('#embedcodebtn').popover(
</li>
{% if ismod() %}
<li
class=
"pull-right"
>
<button
class=
"btn btn-default"
data-toggle=
"modal"
data-target=
"#editstream"
>
<button
class=
"btn btn-default"
data-toggle=
"modal"
data-target=
"#editstream"
data-path=
"{{ 'lectures.%i.stream_settings'%lecture.id }}"
data-value=
'{{ lecture.stream_settings|e }}'
>
<span
class=
"glyphicon glyphicon-transfer"
></span>
</button>
</li>
...
...
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