ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2392 from emanuelschuetze/ui-sref

Browse Source 
Use ui-sref instead of ng-click (with $state.go).
This commit is contained in:
Norman Jäckel 2016-09-17 12:02:15 +02:00 committed by GitHub
commit e0f8dd9e29
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openslides/agenda/static/js/agenda/site.js
View File

@ -142,16 +142,6 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
$scope.newDialog = function () { $scope.newDialog = function () {
ngDialog.open(CustomslideForm.getDialog()); ngDialog.open(CustomslideForm.getDialog());
}; };
// open edit dialog
$scope.editDialog = function (item) {
$state.go(item.content_object.collection.replace('/','.')+'.detail.update',
{id: item.content_object.id});
};
// detail view of related item (content object)
$scope.open = function (item) {
$state.go(item.content_object.collection.replace('/','.')+'.detail',
{id: item.content_object.id});
};
// cancel QuickEdit mode // cancel QuickEdit mode
$scope.cancelQuickEdit = function (item) { $scope.cancelQuickEdit = function (item) {
// revert all changes by restore (refresh) original item object from server // revert all changes by restore (refresh) original item object from server
@ -264,12 +254,6 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
$scope.speakers = $filter('orderBy')(item.speakers, 'weight'); $scope.speakers = $filter('orderBy')(item.speakers, 'weight');
}); });
// go to detail view of related item (content object)
$scope.open = function (item) {
$state.go(item.content_object.collection.replace('/','.')+'.detail',
{id: item.content_object.id});
};
// close/open list of speakers of current item // close/open list of speakers of current item
$scope.closeList = function (listClosed) { $scope.closeList = function (listClosed) {
item.speaker_list_closed = listClosed; item.speaker_list_closed = listClosed;

2
openslides/agenda/static/templates/agenda/item-detail.html
View File

@ -5,7 +5,7 @@
<i class="fa fa-angle-double-left fa-lg"></i> <i class="fa fa-angle-double-left fa-lg"></i>
<translate>Agenda</translate> <translate>Agenda</translate>
</a> </a>
<a href="" ng-click="open(item)" class="btn btn-sm btn-default"> <a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail({id: item.content_object.id})" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i> <i class="fa fa-angle-double-left fa-lg"></i>
{{ item.getContentResource().verboseName | translate }} {{ item.getContentResource().verboseName | translate }}
</a> </a>

8
openslides/agenda/static/templates/agenda/item-list.html
View File

@ -169,7 +169,7 @@
<td ng-if="!item.quickEdit" ng-mouseover="item.hover=true" ng-mouseleave="item.hover=false" <td ng-if="!item.quickEdit" ng-mouseover="item.hover=true" ng-mouseleave="item.hover=false"
style="padding-left: calc(8px + {{ item.parentCount }}*15px)"> style="padding-left: calc(8px + {{ item.parentCount }}*15px)">
<strong> <strong>
<a ng-show="isAllowedToSeeOpenLink(item)" href="" ng-click="open(item)"> <a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail({id: item.content_object.id})" ng-show="isAllowedToSeeOpenLink(item)">
{{ item.getListViewTitle() }} {{ item.getListViewTitle() }}
</a> </a>
<span ng-hide="isAllowedToSeeOpenLink(item)"> <span ng-hide="isAllowedToSeeOpenLink(item)">
@ -183,7 +183,8 @@
<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 href="" ng-click="editDialog(item)" translate>Edit</a> | <a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail.update({id: item.content_object.id})"
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"
ng-bootbox-confirm="{{ 'Are you sure you want to delete this entry?' | translate }}<br> ng-bootbox-confirm="{{ 'Are you sure you want to delete this entry?' | translate }}<br>
@ -233,7 +234,8 @@
<button ng-click="save(item)" class="btn btn-primary" translate> <button ng-click="save(item)" class="btn btn-primary" translate>
Update Update
</button> </button>
<a href="" ng-click="editDialog(item)" class="pull-right"><translate>Edit ...</translate></a> <a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail.update({id: item.content_object.id})"
class="pull-right"><translate>Edit ...</translate></a>
</div> </div>
</table> </table>
<uib-pagination ng-show="itemsFiltered.length > itemsPerPage" total-items="itemsFiltered.length" items-per-page="itemsPerPage" ng-model="currentPage" <uib-pagination ng-show="itemsFiltered.length > itemsPerPage" total-items="itemsFiltered.length" items-per-page="itemsPerPage" ng-model="currentPage"