Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

efabi PR #1

Open
wants to merge 57 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
e6782ba
CHANGES:
FreelancerAMP Mar 28, 2023
29c6a1c
Merge branch 'main' into efabi
FreelancerAMP Mar 28, 2023
1a30f5c
Merge main into efabi
github-actions[bot] Mar 28, 2023
0c3734a
Merge main into efabi
github-actions[bot] Mar 28, 2023
6e8f9a5
Merge main into efabi
github-actions[bot] Mar 28, 2023
d76e733
CHANGES:
johappel Mar 31, 2023
a427442
CHANGES:
johappel Mar 31, 2023
b127949
CHANGES:
johappel Apr 3, 2023
1fb4a54
Merge main into efabi
github-actions[bot] Apr 3, 2023
b36da58
REMOVED deprecated code
FreelancerAMP Apr 3, 2023
c78f4ee
Merge remote-tracking branch 'origin/efabi' into efabi
johappel Apr 3, 2023
e97024c
Merge main into efabi
github-actions[bot] Apr 3, 2023
f391680
Merge main into efabi
github-actions[bot] Apr 3, 2023
0262f00
Merge main into efabi
github-actions[bot] Apr 4, 2023
6c9bbab
Merge main into efabi
github-actions[bot] Apr 4, 2023
afc2b2e
Merge main into efabi
github-actions[bot] Apr 5, 2023
4cf7f05
CHANGES:
johappel Apr 5, 2023
cd2b8b2
Merge remote-tracking branch 'origin/efabi' into efabi
johappel Apr 5, 2023
e9588ba
CHANGES:
johappel Apr 5, 2023
9609fc0
Merge main into efabi
github-actions[bot] Apr 5, 2023
417b0c6
Merge main into efabi
github-actions[bot] Apr 6, 2023
bc84037
CHANGES:
johappel Apr 6, 2023
b703f5b
Merge remote-tracking branch 'origin/efabi' into efabi
johappel Apr 6, 2023
8ae9aca
CHANGES:
johappel Apr 11, 2023
4e05209
Merge main into efabi
github-actions[bot] Apr 11, 2023
5f17c81
CHANGES:
johappel Apr 11, 2023
fb7ccfd
Merge remote-tracking branch 'origin/efabi' into efabi
johappel Apr 11, 2023
93a0219
Merge main into efabi
github-actions[bot] Apr 11, 2023
9280852
Merge main into efabi
github-actions[bot] Apr 11, 2023
6405391
Merge main into efabi
github-actions[bot] Apr 11, 2023
b627892
CHANGES:
johappel Apr 11, 2023
cd1f355
Merge remote-tracking branch 'origin/efabi' into efabi
johappel Apr 11, 2023
338a0ab
UPDATED toolbar name of group if group is constituted
johappel Apr 12, 2023
cab776e
Merge main into efabi
github-actions[bot] Apr 12, 2023
98ec705
Merge main into efabi
github-actions[bot] Apr 12, 2023
48323a7
Merge main into efabi
github-actions[bot] Apr 12, 2023
9029de0
CHANGES:
johappel Apr 19, 2023
8a29156
Merge branch 'main' into efabi
FreelancerAMP Apr 20, 2023
7f56802
Merge main into efabi
github-actions[bot] Apr 21, 2023
ff6015e
Merge main into efabi
github-actions[bot] Apr 25, 2023
ec577ef
CHANGES:
johappel May 8, 2023
00d11ad
Merge main into efabi
github-actions[bot] May 26, 2023
a4dc2ce
Merge main into efabi
github-actions[bot] Jun 27, 2023
1ac48d3
Merge main into efabi
github-actions[bot] Jun 30, 2023
395198a
Merge main into efabi
github-actions[bot] Jul 10, 2023
f46720f
Merge main into efabi
github-actions[bot] Nov 29, 2023
a70e017
Merge main into efabi
github-actions[bot] Nov 29, 2023
499d582
Merge main into efabi
github-actions[bot] Dec 1, 2023
872019d
Merge main into efabi
github-actions[bot] Dec 20, 2023
65abd6d
Merge main into efabi
github-actions[bot] Dec 20, 2023
6d44df4
Merge main into efabi
github-actions[bot] Dec 28, 2023
25dcbae
Merge main into efabi
github-actions[bot] Jan 10, 2024
0d236bc
Merge main into efabi
github-actions[bot] Jan 10, 2024
2d71ca7
Merge main into efabi
github-actions[bot] Jan 10, 2024
cef36d4
Merge main into efabi
github-actions[bot] Jan 10, 2024
40f68ee
Merge main into efabi
github-actions[bot] Feb 12, 2024
a791630
Merge main into efabi
github-actions[bot] Feb 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions rpi-wall-installer.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ public function add_custom_capabilities()
$role->add_cap('delete_badge');
$role->add_cap('assign_badge');

$role->add_cap('manage_schooltype');
$role->add_cap('edit_schooltype');
$role->add_cap('delete_schooltype');
$role->add_cap('assign_schooltype');
$role->add_cap('manage_section');
$role->add_cap('edit_section');
$role->add_cap('delete_section');
$role->add_cap('assign_section');

/*
if($roleslug === 'editor'){
Expand Down Expand Up @@ -141,7 +141,7 @@ public function add_custom_capabilities()

$role->add_cap('assign_badge');

$role->add_cap('assign_schooltype');
$role->add_cap('assign_section');

}
}
Expand Down Expand Up @@ -254,7 +254,7 @@ public function register_post_types()
"editor",
"comments"
],
'taxonomies' => ['wall-tag', "badge", 'schooltype', 'profession'],
'taxonomies' => ['wall-tag', "badge", 'section', 'profession'],
"show_in_graphql" => false,
];

Expand Down Expand Up @@ -552,17 +552,17 @@ function register_taxonomies()
register_taxonomy("badge", ["member"], $args);

/**
* Taxonomy: schooltype.
* Taxonomy: Section.
*/

$labels = [
"name" => __("Schulformen", "blocksy"),
"singular_name" => __("Schulform", "blocksy"),
"name" => __("Bereiche", "blocksy"),
"singular_name" => __("Bereich", "blocksy"),
];


$args = [
"label" => __("Schulform", "blocksy"),
"label" => __("Bereich", "blocksy"),
"labels" => $labels,
"public" => true,
"publicly_queryable" => true,
Expand All @@ -571,24 +571,24 @@ function register_taxonomies()
"show_in_menu" => true,
"show_in_nav_menus" => true,
"query_var" => true,
"rewrite" => ['slug' => 'schooltype', 'with_front' => true, 'hierarchical' => true,],
"rewrite" => ['slug' => 'section', 'with_front' => true, 'hierarchical' => true,],
"show_admin_column" => false,
"show_in_rest" => true,
"show_tagcloud" => false,
"rest_base" => "schooltype",
"rest_base" => "section",
"rest_controller_class" => "WP_REST_Terms_Controller",
"rest_namespace" => "wp/v2",
"show_in_quick_edit" => false,
"sort" => false,
"show_in_graphql" => false,
"capabilities" => array(
'manage_terms' => 'manage_schooltype',
'edit_terms' => 'edit_schooltype',
'delete_terms' => 'delete_schooltype',
'assign_terms' => 'assign_schooltype'
'manage_terms' => 'manage_section',
'edit_terms' => 'edit_section',
'delete_terms' => 'delete_section',
'assign_terms' => 'assign_section'
),
];
register_taxonomy("schooltype", ["member"], $args);
register_taxonomy("section", ["member"], $args);

/**
* Taxonomy: profession.
Expand Down
4 changes: 2 additions & 2 deletions shortcodes.php
Original file line number Diff line number Diff line change
Expand Up @@ -576,12 +576,12 @@ public function display_termine($atts)
</h4>
<span class="dibes-termin termin-type">
<div class="dibes-termin termin-type-color"></div>
<div class="dibes-termin termin-type-name">- Schule Evangelisch Digital Termin</div>
<div class="dibes-termin termin-type-name">- Netzwerk Termin</div>
</span>
<?php if (is_user_logged_in()) { ?>
<span class="plg-termin termin-type">
<div class="plg-termin termin-type-color"></div>
<div class="plg-termin termin-type-name">- Termin deiner PLG</div>
<div class="plg-termin termin-type-name">- AG-Treffen</div>
</span>
<?php } ?>
</div>
Expand Down