hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix publication creation, edition, sorting

Browse Source
This commit is contained in:
Florian BLOUET
2016-03-21 09:00:07 +01:00
parent 4f57b141a3
commit c632975de3
5 changed files with 16 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Alchemy/Phrasea/Controller/Prod/FeedController.php
View File

@@ -54,7 +54,7 @@ class FeedController extends Controller
$user = $this->getAuthenticatedUser(); $user = $this->getAuthenticatedUser();
$publisher = $this->getFeedPublisherRepository()->findOneBy([ $publisher = $this->getFeedPublisherRepository()->findOneBy([
'feed' => $feed, 'feed' => $feed,
'user' => $user, 'user' => $user,
]); ]);
@@ -148,7 +148,7 @@ class FeedController extends Controller
$entry->setFeed($new_feed); $entry->setFeed($new_feed);
} }
$items = explode(';', $request->request->get('sorted_lst')); $items = explode(';', $request->request->get('lst'));
$item_repository = $this->getFeedItemRepository(); $item_repository = $this->getFeedItemRepository();
$manager = $this->getEntityManager(); $manager = $this->getEntityManager();
@@ -167,7 +167,7 @@ class FeedController extends Controller
return $this->app->json([ return $this->app->json([
'error' => false, 'error' => false,
'message' => 'succes', 'message' => 'success',
'datas' => $this->render('prod/results/entry.html.twig', ['entry' => $entry]), 'datas' => $this->render('prod/results/entry.html.twig', ['entry' => $entry]),
]); ]);
} }

2
package.json
View File

@@ -33,6 +33,6 @@
"postinstall": "./node_modules/.bin/gulp install;" "postinstall": "./node_modules/.bin/gulp install;"
}, },
"dependencies": { "dependencies": {
"phraseanet-production-client": "~0.3.0" "phraseanet-production-client": "~0.4.0"
} }
} }

9
resources/www/prod/skins/ui-components/_modal-publish.scss
View File

@@ -1,5 +1,14 @@
#modal_feed { #modal_feed {
.record_list .ui-state-highlight {
width: 112px;
height: 118px;
position: relative;
float: left;
background: none;
background-color: $darkBackgroundColor;
border-color: $mediumBackgroundColor;
}
form { form {
.feeds { .feeds {
color: $darkerTextColor; color: $darkerTextColor;

24
templates/web/prod/actions/publish/publish.html.twig
View File

@@ -5,18 +5,9 @@
</div> </div>
{% endmacro %} {% endmacro %}
<style type="text/css">
.record_list .sortable.ui-sortable-placeholder{
width:112px;
height:118px;
position:relative;
float:left;
}
</style>
<div id="modal_feed"> <div id="modal_feed">
<div class="row-fluid" style="height:120px"> <div class="row-fluid" style="height:120px">
<div class="span12" style="overflow:auto;"> <div class="span12 record_list" style="overflow:auto;">
{% for record in publishing %} {% for record in publishing %}
<div class="sortable" style="position:relative;float:left;"> <div class="sortable" style="position:relative;float:left;">
{{ _self.format_diapo(record) }} {{ _self.format_diapo(record) }}
@@ -83,16 +74,3 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).ready(function(){
$('#modal_feed .record_list').sortable({
stop:function(event, ui){
var lst = [];
$('#modal_feed .record_list .sortable form').each(function(i, el){
lst.push($('input[name="sbas_id"]', el).val()+'_'+$('input[name="record_id"]', el).val());
});
$('#modal_feed form.main_form input[name="lst"]').val(lst.join(';'));
}
});
});
</script>

26
templates/web/prod/actions/publish/publish_edit.html.twig
View File

@@ -5,18 +5,9 @@
</div> </div>
{% endmacro %} {% endmacro %}
<style type="text/css">
.record_list .sortable.ui-sortable-placeholder{
width:112px;
height:118px;
position:relative;
float:left;
}
</style>
<div id="modal_feed"> <div id="modal_feed">
<div class="row-fluid" style="height:120px"> <div class="row-fluid" style="height:120px">
<div class="span12" style="overflow:auto;"> <div class="span12 record_list" style="overflow:auto;">
{% for content in entry.getItems() %} {% for content in entry.getItems() %}
<div class="sortable" style="position:relative;float:left;"> <div class="sortable" style="position:relative;float:left;">
{{ _self.format_diapo(content.getRecord(app)) }} {{ _self.format_diapo(content.getRecord(app)) }}
@@ -31,7 +22,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<form class="main_form" method="post" action="{{ path('prod_feeds_entry_update', {'id': entry.getId()}) }}"> <form class="main_form" method="post" action="{{ path('prod_feeds_entry_update', {'id': entry.getId()}) }}">
<input type="hidden" name="sorted_lst" value="" /> <input type="hidden" name="lst" value="" />
<div class="row-fluid"> <div class="row-fluid">
<div class="span6"> <div class="span6">
<h1>{{ 'Editer' | trans }}</h1> <h1>{{ 'Editer' | trans }}</h1>
@@ -68,16 +59,3 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).ready(function(){
$('#modal_feed .record_list').sortable({
stop:function(event, ui){
var lst = [];
$('#modal_feed .record_list form').each(function(i, el){
lst.push($('input[name="item_id"]', el).val()+'_'+(i+1));
});
$('#modal_feed form.main_form input[name="sorted_lst"]').val(lst.join(';'));
}
});
});
</script>