Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Garuda
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stud.IP
Plugins
Garuda
Commits
853987cf
Commit
853987cf
authored
5 months ago
by
Thomas Hackl
Browse files
Options
Downloads
Patches
Plain Diff
bugfix: correctly handle empty IGNORE_SUBJECT_IDS
parent
00bc195f
Branches
Branches containing commit
Tags
v2.14.1
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
controllers/message.php
+1
-1
1 addition, 1 deletion
controllers/message.php
models/GarudaModel.php
+2
-4
2 additions, 4 deletions
models/GarudaModel.php
plugin.manifest
+1
-1
1 addition, 1 deletion
plugin.manifest
with
4 additions
and
6 deletions
controllers/message.php
+
1
−
1
View file @
853987cf
...
@@ -767,7 +767,7 @@ class MessageController extends AuthenticatedController {
...
@@ -767,7 +767,7 @@ class MessageController extends AuthenticatedController {
dgettext
(
'garuda'
,
'Ihre Nachricht an %u Personen wurde gespeichert.'
),
dgettext
(
'garuda'
,
'Ihre Nachricht an %u Personen wurde gespeichert.'
),
count
(
$this
->
flash
[
'users'
])));
count
(
$this
->
flash
[
'users'
])));
}
else
{
}
else
{
PageLayout
::
post
Success
(
sprintf
(
PageLayout
::
post
Error
(
sprintf
(
dgettext
(
'garuda'
,
'Ihre Nachricht an %u Personen konnte nicht gespeichert werden.'
),
dgettext
(
'garuda'
,
'Ihre Nachricht an %u Personen konnte nicht gespeichert werden.'
),
count
(
$this
->
flash
[
'users'
])));
count
(
$this
->
flash
[
'users'
])));
}
}
...
...
This diff is collapsed.
Click to expand it.
models/GarudaModel.php
+
2
−
4
View file @
853987cf
...
@@ -256,7 +256,7 @@ class GarudaModel {
...
@@ -256,7 +256,7 @@ class GarudaModel {
JOIN `auth_user_md5` a USING (`user_id`)
JOIN `auth_user_md5` a USING (`user_id`)
WHERE s.`fach_id` NOT IN (:ignored)
WHERE s.`fach_id` NOT IN (:ignored)
AND a.`visible` != 'never'"
,
AND a.`visible` != 'never'"
,
[
'ignored'
=>
Config
::
get
()
->
GARUDA_IGNORE_SUBJECT_IDS
]
[
'ignored'
=>
Config
::
get
()
->
GARUDA_IGNORE_SUBJECT_IDS
?:
[
''
]
]
);
);
}
else
{
}
else
{
$query
=
"SELECT DISTINCT `user_id` FROM `user_studiengang`"
;
$query
=
"SELECT DISTINCT `user_id` FROM `user_studiengang`"
;
...
@@ -273,15 +273,13 @@ class GarudaModel {
...
@@ -273,15 +273,13 @@ class GarudaModel {
$parameters
[]
=
$entry
[
'fach_id'
];
$parameters
[]
=
$entry
[
'fach_id'
];
}
}
$where
.
=
" AND `fach_id` NOT IN (?)"
;
$where
.
=
" AND `fach_id` NOT IN (?)"
;
$parameters
[]
=
Config
::
get
()
->
GARUDA_IGNORE_SUBJECT_IDS
;
$parameters
[]
=
Config
::
get
()
->
GARUDA_IGNORE_SUBJECT_IDS
?:
[
''
]
;
$query
.
=
$where
;
$query
.
=
$where
;
return
DBManager
::
get
()
->
fetchFirst
(
$query
,
$parameters
);
return
DBManager
::
get
()
->
fetchFirst
(
$query
,
$parameters
);
}
else
{
}
else
{
return
[];
return
[];
}
}
return
DBManager
::
get
()
->
fetchFirst
(
$query
,
$parameters
);
}
}
return
array
();
}
}
public
static
function
getAllEmployees
(
$userId
,
$config
)
public
static
function
getAllEmployees
(
$userId
,
$config
)
...
...
This diff is collapsed.
Click to expand it.
plugin.manifest
+
1
−
1
View file @
853987cf
pluginname=Garuda
pluginname=Garuda
pluginclassname=GarudaPlugin
pluginclassname=GarudaPlugin
origin=intelec
origin=intelec
version=2.14
version=2.14
.1
description=Allows mail sending to selectable target audiences.
description=Allows mail sending to selectable target audiences.
studipMinVersion=5.3
studipMinVersion=5.3
studipMaxVersion=5.9.99
studipMaxVersion=5.9.99
This diff is collapsed.
Click to expand it.
Thomas Hackl
@hackl
mentioned in issue
#10
·
5 months ago
mentioned in issue
#10
mentioned in issue #10
Toggle commit list
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
sign in
to comment