orgFeature/5 3/positions in org units #11
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…pdate scripts according to target branches after integration merges
…fering getters for the different quantity categories by initialising and iterating on internal registers (1)
…e non used up is left open
… rest of earth time
…etween toolbar button action and cration form
…studer-raimann/ILIAS into trunk_ia_positions
…ional Feature "Additional Data for Page Editor Plugins" Looks ok to me, thanks. I will makes some deeper analysis in the next days.
…studer-raimann/ILIAS into trunk_ia_positions
…page: fixed user link button
# Conflicts: # libs/composer/vendor/composer/autoload_classmap.php # setup/sql/dbupdate_04.php
# Conflicts: # libs/composer/vendor/composer/autoload_classmap.php # setup/sql/dbupdate_04.php
Feature: SAML Authentication
# Conflicts: # lang/ilias_en.lang # libs/composer/vendor/composer/autoload_classmap.php # libs/composer/vendor/composer/autoload_static.php
…nto feature/5-3/PositionsInOrgUnits # Conflicts: # Services/AccessControl/classes/class.ilAccess.php # lang/ilias_de.lang # lang/ilias_en.lang # setup/sql/dbupdate_04.php
|
Thanks Fabian. No I do not have other branches. |
smeyer-ilias
pushed a commit
that referenced
this pull request
Apr 16, 2020
…n object that implements Countable Fixing error by using ldap-user-sync. replace debug message after checking for an array ERROR-LOG: ilCronManager::runJob:95 count(): Parameter must be an array or an object that implements Countable ilCronManager::runJob:95 #0 ILIAS_PATH/Services/Init/classes/class.ilErrorHandling.php(461): Whoops\Run->handleError(2, 'count(): Parame...', 'ILIAS_PATH...', 387) #1 ILIAS_PATH/Services/LDAP/classes/class.ilLDAPQuery.php(387): ilErrorHandling->handlePreWhoops(2, 'count(): Parame...', 'ILIAS_PATH...', 387, Array) #2 ILIAS_PATH/Services/LDAP/classes/class.ilLDAPQuery.php(131): ilLDAPQuery->fetchGroupMembers() #3 ILIAS_PATH/Services/LDAP/classes/class.ilLDAPCronSynchronization.php(87): ilLDAPQuery->fetchUsers() #4 ILIAS_PATH/Services/Cron/classes/class.ilCronManager.php(178): ilLDAPCronSynchronization->run() #5 ILIAS_PATH/Services/Cron/classes/class.ilCronManager.php(95): ilCronManager::runJob(Object(ilLDAPCronSynchronization), Array, true) #6 ILIAS_PATH/Services/Cron/classes/class.ilCronManagerGUI.php(282): ilCronManager::runJobManual('ldap_sync') #7 ILIAS_PATH/Services/Cron/classes/class.ilCronManagerGUI.php(64): ilCronManagerGUI->confirmedRun() #8 ILIAS_PATH/Services/UICore/classes/class.ilCtrl.php(210): ilCronManagerGUI->executeCommand() #9 ILIAS_PATH/Modules/SystemFolder/classes/class.ilObjSystemFolderGUI.php(152): ilCtrl->forwardCommand(Object(ilCronManagerGUI)) #10 ILIAS_PATH/Services/UICore/classes/class.ilCtrl.php(210): ilObjSystemFolderGUI->executeCommand() #11 ILIAS_PATH/Services/Administration/classes/class.ilAdministrationGUI.php(250): ilCtrl->forwardCommand(Object(ilObjSystemFolderGUI)) #12 ILIAS_PATH/Services/UICore/classes/class.ilCtrl.php(210): ilAdministrationGUI->executeCommand() #13 ILIAS_PATH/Services/UICore/classes/class.ilCtrl.php(175): ilCtrl->forwardCommand(Object(ilAdministrationGUI)) #14 ILIAS_PATH/ilias.php(20): ilCtrl->callBaseClass() #15 {main}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hallo @smeyer-ilias
ich habe mal versucht unsere Branches zusammenzulegen, damit du auch wieder auf dem aktuellsten Stand bist. Hast du noch andere Branches, die da rein müssten?
Das Interface ist nun komplett und funktionstüchtig, daher habe ich deine statischen Einträge in ilAccess entfernt
Gruss Fabian