Commit Graph

417 Commits

Author SHA1 Message Date
Toby Zerner
aa62a88718 Change tag permission logic
Require a user to have permission for *all* of the restricted tags a
discussion has, rather than just one.

See https://github.com/flarum/flarum-ext-approval/pull/7#issuecomment-316561532
2017-07-20 11:21:19 +09:30
Toby Zerner
05fab134e9 Fix permissions not applying
The AbstractPolicy's `before` method was changed to `after` a while ago,
and this instance must've slipped through the cracks.
2017-07-20 09:48:49 +09:30
David Sevilla Martín
3c0efb3373 Show modal if # of primary/secondary tags is less than required (#41) 2017-07-15 08:28:08 +02:00
Toby Zerner
fb17769074 Actually no npm lockfile, at least for now
Since I tend to do `npm link gulp flarum-gulp` so I'm not sure if the lockfile is valid?
2017-07-08 21:48:36 +09:30
Toby Zerner
162eef01dd Update dependencies 2017-07-08 21:36:49 +09:30
Toby Zerner
99c62ccdb0 Fix validation of "hidden" checkbox not working 2017-07-08 21:36:30 +09:30
Toby Zerner
49504da31e Merge pull request #40 from dshoreman/eagerload
Lazy-load any included relationships on /api/tags
2017-04-12 06:38:29 +09:30
Dave Shoreman
c2fe1fdce5 Lazy-load any included relationships on /api/tags 2017-04-11 14:01:17 +01:00
Dave Shoreman
f61d834a76 Enable parent to be set during creation via API (#39)
* Enable parent to be set during creation via API

Sets the parent ID as long as it exists and is a top-level primary tag.
If it's not, it'll simply be ignored. Position is set automatically to
be one higher than the current highest, or 0 if parent has no children.

Example data (in addition to the usual attributes):
```
"relationships": {
    "parent": {
        "data": {
            "id": 1
        }
    }
}
```

* Add support for creating top-level tags

To set a top-level primary tag, pass parent id of 0
For a secondary tag, pass null or remove it from the request
To set as a child, pass the parent tag's id
2017-04-11 13:54:35 +09:30
Toby Zerner
61321c32ed Merge pull request #38 from dshoreman/include-fix
Specify available includes for /api/tags endpoint
2017-04-11 10:38:59 +09:30
Dave Shoreman
941a0b2c8a Specify available includes for /api/tags endpoint 2017-04-10 23:23:32 +01:00
Toby Zerner
dfe094981b Merge pull request #36 from dshoreman/fix-api-error
Fix Internal Server Error for blank API requests
2017-04-07 18:05:28 +09:30
Dave Shoreman
fb8ad8fe9a Fix Internal Server Error for blank API requests
Attempting to send an empty body to the create and update endpoints will
result in Flarum outputting "Internal Server Error" as plain text,
instead of failing gracefully with a json-ised validation exception.

This commit adds an empty array as the third parameter to array_get,
which sets the default value and thus allows Flarum to do its thing.
2017-04-06 04:16:40 +01:00
Franz Liedke
be643a1e4b Merge pull request #35 from janga1997/patch-1
Hide diff for compiled diff files
2017-02-20 16:18:48 +01:00
VSN Reddy Janga
dba8ab3244 Hide diff for compiled diff files 2017-02-20 19:27:07 +05:30
Franz Liedke
4fda3ea7d9 Merge pull request #34 from milescellar/patch-1
Update year
2017-01-02 20:03:58 +01:00
Miles Cellar
1464859bfd Update year 2017-01-01 22:42:58 +01:00
Toby Zerner
ec118b93b4 Merge pull request #31 from flarum/analysis-8jJ1xB
Apply fixes from StyleCI
2016-11-29 15:58:28 +10:30
Toby Zerner
c7abaca6bc Apply fixes from StyleCI
[ci skip] [skip ci]
2016-11-29 05:28:17 +00:00
Toby Zerner
deee3c02da Add TagWillBeSaved event 2016-11-28 11:48:28 +10:30
Toby Zerner
4773b3005d Add tag-user state 2016-11-28 11:48:19 +10:30
Toby Zerner
6a363ef4f1 Extract edit tag submit data for extensibility 2016-11-19 22:12:53 +10:30
Toby Zerner
6f9c6ea3dc Recompile JS 2016-11-19 22:12:03 +10:30
Toby Zerner
5b2966cbc4 Update StyleCI rules 2016-11-16 15:46:28 +10:30
Toby Zerner
11b380c893 Fix permission logic regressions
Make sure permissions that lie "dormant" in the database don't interfere with the global permissions; actually check each tag's permissions rather than using `hasPermissionLike`.

closes flarum/core#1058
closes flarum/core#1062
2016-11-07 22:22:19 +10:30
Toby Zerner
eb279b112a v0.1.0-beta.6 2016-10-19 21:11:56 +10:30
Toby Zerner
d68c8e6adb Fix typo 2016-08-03 13:11:23 +09:30
Toby Zerner
e84788d646 Merge pull request #29 from coderstephen/master
Add posts API filter for tags
2016-08-02 22:06:34 +10:00
Stephen M. Coakley
bf490d19a2 Add posts API filter for tags
Add the means of filtering post queries by the tags of the posts' parent discussions. See https://github.com/flarum/core/issues/990.
2016-08-01 14:10:06 -05:00
Franz Liedke
e4a4bad601 Make StyleCI happy 2016-06-13 21:06:39 +09:00
Toby Zerner
2c4ccc89f9 Use validator for attribute translations
closes flarum/core#973
2016-06-05 09:28:13 +09:30
Toby Zerner
5189744038 Use Illuminate to validate tag counts and thus make errors translatable. closes flarum/core#973 2016-06-04 18:46:24 +09:30
Toby Zerner
020d850a3a Disassociate child tag when parent is deleted. fixes flarum/core#962 2016-06-04 16:25:57 +09:30
Toby Zerner
1dc495dfdd Use new event name 2016-06-03 11:03:17 +09:30
Toby Zerner
947587272a Recompile dist JS using latest version of babel 2016-06-03 11:03:11 +09:30
Toby Zerner
7d5bc472f8 Revert "Simplify discussion/tag permission logic"
This reverts commit 01e776e2be.

Turns out that there was a good reason for the original logic... the case of per-tag moderators.
2016-05-28 20:49:43 +09:30
Toby Zerner
9661e05c83 Update permission icon for consistency 2016-05-28 10:03:27 +09:30
Toby Zerner
1629e7fbb4 Add separate tag permission for being able to add that tag to discussions
By default this is just the same as the "startDiscussion" permission, but flarum-ext-approval comes in and denies "addToDiscussion" specifically for tags where the user can't start discussions without approval.

ref flarum/core#904
2016-05-28 10:03:00 +09:30
Toby Zerner
01e776e2be Simplify discussion/tag permission logic
A user now must have a permission to act for *all* tags assigned to a discussion, rather than just one of them. This is consistent with the way the permissions are worked out for visibility.
2016-05-28 10:00:41 +09:30
Toby Zerner
e3278070ac Rename DiscussionWasTagged user property for consistency 2016-05-28 09:55:45 +09:30
Toby Zerner
63a4b34d6e Serialise tag IDs to integers rather than strings 2016-05-28 09:54:39 +09:30
Toby Zerner
822e823936 Compatibility with new "required permissions" concept 2016-05-27 14:41:48 +09:30
Toby Zerner
c809f329bb Update settings reference 2016-05-26 19:05:28 +09:30
Franz Liedke
84974d3f31 Use newly extracted KeyboardNavigatable util for emoji dropdown
Refs flarum/core#264.
2016-05-15 23:18:29 +09:00
Franz Liedke
7190cd84b4 Use the variables that are already instantiated 2016-05-15 20:58:29 +09:00
Franz Liedke
6e0f77b0e3 Merge pull request #28
Closes flarum/core#600.
2016-04-15 21:06:01 +09:00
Franz Liedke
14eb7c97d0 Only list tags available to current user 2016-04-15 21:01:23 +09:00
Niels Tholenaar
1b23e44b06 Added REST tags endpoint (https://github.com/flarum/core/issues/600) 2016-04-15 09:44:53 +02:00
Toby Zerner
36c4c5d966 Require core v0.1.0-beta.5 2016-03-29 18:50:22 +10:30
Toby Zerner
534a96fb72 Fix checkbox/name/description alignment in tag discussion modal 2016-03-28 11:48:01 +10:30