Merge branch 'develop' into trunk
This commit is contained in:
commit
324841b778
3 changed files with 6 additions and 2 deletions
|
|
@ -407,6 +407,7 @@ class MediaController extends Controller
|
|||
|
||||
// ---- Les articles
|
||||
$media->articles()->sync(collect($request->articles)->pluck('id')->all());
|
||||
Article::flushQueryCache();
|
||||
|
||||
$media->saveOrFail();
|
||||
|
||||
|
|
|
|||
|
|
@ -75,6 +75,6 @@ class Article extends Model
|
|||
*/
|
||||
public function mediaList()
|
||||
{
|
||||
return $this->belongsToMany(Media::class, 'media_article', 'media_id', 'article_id');
|
||||
return $this->belongsToMany(Media::class, 'media_article', 'article_id', 'media_id');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -713,10 +713,13 @@ export default {
|
|||
.then((response) => {
|
||||
const result = response.data;
|
||||
if (result.article.utilisableGroupe === 1) {
|
||||
const index = this.oMedia.articles.find(
|
||||
const index = this.oMedia.articles?.find(
|
||||
(e) => e.noArt === result.article.noArt
|
||||
);
|
||||
if (!index) {
|
||||
if (!this.oMedia.articles) {
|
||||
this.$set(this.oMedia, 'articles', []);
|
||||
}
|
||||
this.oMedia.articles.push(result.article);
|
||||
} else {
|
||||
$.fancyMessage({
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue