Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
6d4949cd
Commit
6d4949cd
authored
8 years ago
by
Daniel Haag
Browse files
Options
Downloads
Patches
Plain Diff
OPENOLAT-266: Disable test replacement button for non admins when testresults exist.
parent
8d957c93
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/olat/course/nodes/iq/IQEditController.java
+33
-2
33 additions, 2 deletions
src/main/java/org/olat/course/nodes/iq/IQEditController.java
src/main/java/org/olat/course/nodes/iq/_content/edit.html
+3
-1
3 additions, 1 deletion
src/main/java/org/olat/course/nodes/iq/_content/edit.html
with
36 additions
and
3 deletions
src/main/java/org/olat/course/nodes/iq/IQEditController.java
+
33
−
2
View file @
6d4949cd
...
...
@@ -83,6 +83,7 @@ import org.olat.course.tree.CourseInternalLinkTreeModel;
import
org.olat.fileresource.FileResourceManager
;
import
org.olat.ims.qti.QTIResult
;
import
org.olat.ims.qti.QTIResultManager
;
import
org.olat.ims.qti.QTIResultSet
;
import
org.olat.ims.qti.editor.QTIEditorPackage
;
import
org.olat.ims.qti.editor.QTIEditorPackageImpl
;
import
org.olat.ims.qti.editor.beecom.objects.Assessment
;
...
...
@@ -334,8 +335,6 @@ public class IQEditController extends ActivateableTabbableDefaultController impl
myContent
=
createVelocityContainer
(
"edit"
);
chooseTestButton
=
LinkFactory
.
createButtonSmall
(
"command.chooseRepFile"
,
myContent
,
this
);
chooseTestButton
.
setElementCssClass
(
"o_sel_test_choose_repofile"
);
changeTestButton
=
LinkFactory
.
createButtonSmall
(
"command.changeRepFile"
,
myContent
,
this
);
changeTestButton
.
setElementCssClass
(
"o_sel_test_change_repofile"
);
// fetch repository entry
RepositoryEntry
re
=
null
;
...
...
@@ -370,6 +369,14 @@ public class IQEditController extends ActivateableTabbableDefaultController impl
previewLink
.
setTitle
(
getTranslator
().
translate
(
"command.preview"
));
}
if
(
re
==
null
||
!
isRestricted
(
re
))
{
changeTestButton
=
LinkFactory
.
createButtonSmall
(
"command.changeRepFile"
,
myContent
,
this
);
changeTestButton
.
setElementCssClass
(
"o_sel_test_change_repofile"
);
}
else
if
(
ureq
.
getUserSession
().
getRoles
().
isOLATAdmin
())
{
changeTestButton
=
LinkFactory
.
createButtonSmall
(
"command.changeRepFile"
,
myContent
,
this
);
changeTestButton
.
setElementCssClass
(
"o_sel_test_change_repofile o_button_dirty"
);
}
String
disclaimer
=
(
String
)
moduleConfiguration
.
get
(
CONFIG_KEY_DISCLAIMER
);
//allowRelativeLinks = courseNode.getModuleConfiguration().getBooleanEntry(CONFIG_KEY_ALLOW_RELATIVE_LINKS);
...
...
@@ -440,6 +447,30 @@ public class IQEditController extends ActivateableTabbableDefaultController impl
||
RepositoryManager
.
getInstance
().
isInstitutionalRessourceManagerFor
(
identity
,
roles
,
re
));
}
/**
* Checks if the QTI Test has already test results
* @param repository entry
* @return
*/
private
boolean
isRestricted
(
RepositoryEntry
re
)
{
OLATResource
res
=
re
.
getOlatResource
();
if
(
OnyxModule
.
isOnyxTest
(
res
))
{
QTIResultManager
qrm
=
QTIResultManager
.
getInstance
();
List
<
QTIResultSet
>
resultSets
=
qrm
.
getResultSets
(
course
.
getResourceableId
(),
courseNode
.
getIdent
(),
re
.
getKey
(),
null
);
return
(
resultSets
.
size
()
>
0
);
}
else
{
String
repositorySoftKey
=
(
String
)
courseNode
.
getModuleConfiguration
().
get
(
IQEditController
.
CONFIG_KEY_REPOSITORY_SOFTKEY
);
Long
repKey
=
RepositoryManager
.
getInstance
().
lookupRepositoryEntryBySoftkey
(
repositorySoftKey
,
true
).
getKey
();
boolean
restrictedEdit
=
false
;
restrictedEdit
=
QTIResultManager
.
getInstance
().
countResults
(
course
.
getResourceableId
(),
courseNode
.
getIdent
(),
repKey
)
>
0
;
return
restrictedEdit
;
}
}
/**
* @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest,
* org.olat.core.gui.components.Component, org.olat.core.gui.control.Event)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/org/olat/course/nodes/iq/_content/edit.html
+
3
−
1
View file @
6d4949cd
...
...
@@ -22,7 +22,9 @@
</div>
<div
class=
"form-group"
>
<div
class=
"col-sm-offset-3 col-sm-9"
>
$r.render("command.changeRepFile")
#if($r.available("command.changeRepFile"))
$r.render("command.changeRepFile")
#end
#if($r.available("command.editRepFile"))
$r.render("command.editRepFile")
#end
...
...
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