Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-18 00:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #2406 from bentiss/fixes

Browse source 
card count placement and export API functionality back
This commit is contained in:
Lauri Ojansivu 2019-05-14 16:25:05 +03:00 • committed by GitHub
commit da083c2e20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/components/lists/list.styl
View file

@ -99,6 +99,10 @@
.highlight .highlight
color: #ce1414 color: #ce1414
.cardCount
color: #8c8c8c
font-size: 0.8em
.list-body .list-body
flex: 1 1 auto flex: 1 1 auto
flex-direction: column flex-direction: column

2
client/components/lists/listHeader.jade
View file

@ -19,7 +19,7 @@ template(name="listHeader")
if showCardsCountForList cards.count if showCardsCountForList cards.count
|  | 
p.quiet.small {{cardsCount}} {{_ 'cards-count'}} span(class="cardCount") {{cardsCount}} {{_ 'cards-count'}}
if isMiniScreen if isMiniScreen
if currentList if currentList
if isWatching if isWatching

23
models/export.js
View file

@ -6,27 +6,34 @@ if (Meteor.isServer) {
// `ApiRoutes.path('boards/export', boardId)`` // `ApiRoutes.path('boards/export', boardId)``
// on the client instead of copy/pasting the route path manually between the // on the client instead of copy/pasting the route path manually between the
// client and the server. // client and the server.
/* /**
* This route is used to export the board FROM THE APPLICATION. * @operation export
* If user is already logged-in, pass loginToken as param "authToken": * @tag Boards
* '/api/boards/:boardId/export?authToken=:token' *
* @summary This route is used to export the board.
*
* @description If user is already logged-in, pass loginToken as param
* "authToken": '/api/boards/:boardId/export?authToken=:token'
* *
* See https://blog.kayla.com.au/server-side-route-authentication-in-meteor/ * See https://blog.kayla.com.au/server-side-route-authentication-in-meteor/
* for detailed explanations * for detailed explanations
*
* @param {string} boardId the ID of the board we are exporting
* @param {string} authToken the loginToken
*/ */
JsonRoutes.add('get', '/api/boards/:boardId/export', function(req, res) { JsonRoutes.add('get', '/api/boards/:boardId/export', function(req, res) {
const boardId = req.params.boardId; const boardId = req.params.boardId;
let user = null; let user = null;
// todo XXX for real API, first look for token in Authentication: header
// then fallback to parameter
const loginToken = req.query.authToken; const loginToken = req.query.authToken;
if (loginToken) { if (loginToken) {
const hashToken = Accounts._hashLoginToken(loginToken); const hashToken = Accounts._hashLoginToken(loginToken);
user = Meteor.users.findOne({ user = Meteor.users.findOne({
'services.resume.loginTokens.hashedToken': hashToken, 'services.resume.loginTokens.hashedToken': hashToken,
}); });
} else if (!Meteor.settings.public.sandstorm) {
Authentication.checkUserId(req.userId);
user = Users.findOne({ _id: req.userId, isAdmin: true });
} }
const exporter = new Exporter(boardId); const exporter = new Exporter(boardId);

2
openapi/generate_openapi.py
View file

@ -678,7 +678,7 @@ def parse_schemas(schemas_dir):
data = ''.join(f.readlines()) data = ''.join(f.readlines())
try: try:
# if the file failed, it's likely it doesn't contain a schema # if the file failed, it's likely it doesn't contain a schema
program = esprima.parseScript(data, options={'comment': True, 'loc': True}) program = esprima.parseModule(data, options={'comment': True, 'loc': True})
except: except:
continue continue