Hotfix for Issue #2566
This commit is contained in:
parent
22ab7a15a3
commit
1ca390876b
@ -156,6 +156,14 @@ angular.module('OpenSlidesApp.agenda.site', [
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$scope.getUpdateStatePrefix = function (item) {
|
||||||
|
var prefix = item.content_object.collection.replace('/','.');
|
||||||
|
// Hotfix for Issue 2566.
|
||||||
|
// The changes could be reverted if Issue 2480 is closed.
|
||||||
|
prefix = prefix.replace('motion-block', 'motionBlock');
|
||||||
|
return prefix;
|
||||||
|
};
|
||||||
|
|
||||||
// pagination
|
// pagination
|
||||||
$scope.currentPage = 1;
|
$scope.currentPage = 1;
|
||||||
$scope.itemsPerPage = 100;
|
$scope.itemsPerPage = 100;
|
||||||
|
@ -220,7 +220,7 @@
|
|||||||
<div os-perms="agenda.can_see" class="hoverActions" ng-class="{'hiddenDiv': !item.hover}">
|
<div os-perms="agenda.can_see" class="hoverActions" ng-class="{'hiddenDiv': !item.hover}">
|
||||||
<a ui-sref="agenda.item.detail({id: item.id})" translate>List of speakers</a>
|
<a ui-sref="agenda.item.detail({id: item.id})" translate>List of speakers</a>
|
||||||
<span os-perms="agenda.can_manage"> |
|
<span os-perms="agenda.can_manage"> |
|
||||||
<a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail.update({id: item.content_object.id})"
|
<a ui-sref="{{ getUpdateStatePrefix(item) }}.detail.update({id: item.content_object.id})"
|
||||||
translate>Edit</a> |
|
translate>Edit</a> |
|
||||||
<a href="" ng-click="item.quickEdit=true" translate>QuickEdit</a> |
|
<a href="" ng-click="item.quickEdit=true" translate>QuickEdit</a> |
|
||||||
<a href="" class="text-danger"
|
<a href="" class="text-danger"
|
||||||
|
@ -259,7 +259,7 @@ angular.module('OpenSlidesApp.motions.site', [
|
|||||||
closeByDocument: false,
|
closeByDocument: false,
|
||||||
resolve: {
|
resolve: {
|
||||||
motionBlock: function () {
|
motionBlock: function () {
|
||||||
return motionBlock;
|
return MotionBlock.find($stateParams.id);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
preCloseCallback: function() {
|
preCloseCallback: function() {
|
||||||
|
Loading…
Reference in New Issue
Block a user