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

Merge pull request #3119 from emanuelschuetze/minorFixes

Browse Source 
Minor fixes
This commit is contained in:
Emanuel Schütze 2017-03-22 08:55:14 +01:00 committed by GitHub
commit ae098b1439
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,7 @@
</a> </a>
</li> </li>
<!-- CSV export --> <!-- CSV export -->
<li> <li os-perms="agenda.can_manage">
<a href="" id="downloadLinkCSV" <a href="" id="downloadLinkCSV"
ng-click="csvExport()"> ng-click="csvExport()">
<i class="fa fa-file-text-o"></i> <i class="fa fa-file-text-o"></i>

12
openslides/motions/static/js/motions/base.js
View File

@ -408,6 +408,18 @@ angular.module('OpenSlidesApp.motions', [
if (!foundSomething && motion.category && motion.category.name.match(new RegExp(searchquery, 'i'))) { if (!foundSomething && motion.category && motion.category.name.match(new RegExp(searchquery, 'i'))) {
foundSomething = true; foundSomething = true;
} }
// search for change recommendation
if (!foundSomething) {
var recommendations = MotionChangeRecommendation.filter({
where: {motion_version_id: this.active_version}
});
foundSomething = _.some(recommendations, function(recommendation) {
if (recommendation.text.match(new RegExp(searchquery, 'i'))) {
return true;
}
});
}
return foundSomething; return foundSomething;
}, },
getChangeRecommendations: function (versionId, order) { getChangeRecommendations: function (versionId, order) {

4
openslides/motions/static/templates/motions/motion-list.html
View File

@ -57,7 +57,7 @@
</a> </a>
</li> </li>
<!-- CSV export --> <!-- CSV export -->
<li> <li os-perms="motions.can_manage">
<a href="" id="downloadLinkCSV" <a href="" id="downloadLinkCSV"
ng-click="csvExport()"> ng-click="csvExport()">
<i class="fa fa-file-text-o"></i> <i class="fa fa-file-text-o"></i>
@ -65,7 +65,7 @@
</a> </a>
</li> </li>
<!-- DOCX export --> <!-- DOCX export -->
<li> <li os-perms="motions.can_manage">
<a href="" ng-click="docxExport()"> <a href="" ng-click="docxExport()">
<i class="fa fa-file-word-o"></i> <i class="fa fa-file-word-o"></i>
DOCX DOCX