gestion repertoire only
This commit is contained in:
root
parent
e92e972c5a
commit
ed1b32e481
|
|
@ -48,6 +48,7 @@ class FileController extends Controller
|
|||
// Récupérer en session le mode de visualisation
|
||||
$sessionviewdirectory = $this->get('session')->get('sessionviewdirectory');
|
||||
if(!is_array($sessionviewdirectory)) $sessionviewdirectory=[$directory=>$defaultview];
|
||||
if(!array_key_exists($directory,$sessionviewdirectory)) $sessionviewdirectory[$directory]=$defaultview;
|
||||
if($view)
|
||||
$sessionviewdirectory[$directory] = $view;
|
||||
$this->get('session')->set('sessionviewdirectory',$sessionviewdirectory);
|
||||
|
|
|
|||
|
|
@ -2388,22 +2388,32 @@ class PagewidgetController extends Controller
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
$onlyservice = $this->container->get('cadoles.portal.service.only');
|
||||
$files=$onlyservice->getDocument($group, $folders, $firstfolder, $tasks);
|
||||
$firstfolder=null;
|
||||
$files=$onlyservice->getDocument($group, $firstfolder, $tasks);
|
||||
|
||||
$grp=null;
|
||||
if($group) $grp=$em->getRepository("CadolesCoreBundle:Group")->find($group);
|
||||
if($grp) $idonly= $grp->getIdOnlyoffice();
|
||||
else $idonly=0;
|
||||
*/
|
||||
|
||||
// Récupération des paramétres du widget
|
||||
$apponly=0;
|
||||
$view="small";
|
||||
foreach($entity->getParameter()["fields"] as $parameter) {
|
||||
switch($parameter["id"]) {
|
||||
case "apponly":
|
||||
$apponly=$parameter["value"];
|
||||
break;
|
||||
break;
|
||||
case "modelist":
|
||||
$view=($parameter["value"]==0?"small":"list");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
// Render
|
||||
return $this->render($this->labelentity.':viewonlydoc.html.twig', [
|
||||
|
|
@ -2411,13 +2421,22 @@ class PagewidgetController extends Controller
|
|||
'canadd' => $cansee,
|
||||
'canupdate' => $cansee,
|
||||
'firstfolder' => $firstfolder,
|
||||
'folders' => $folders,
|
||||
'tasks' => $tasks,
|
||||
'urlonly' => $this->getParameter("widonlyoffice_url")."/products/projects/projects.aspx?prjID=".$idonly,
|
||||
'apponly' => $apponly,
|
||||
'files' => $files,
|
||||
'access' => $access,
|
||||
]);
|
||||
*/
|
||||
|
||||
return $this->render($this->labelentity.':viewonlydoc.html.twig', [
|
||||
'entity' => $entity,
|
||||
'canadd' => $canupdate,
|
||||
'canupdate' => $canupdate,
|
||||
'access' => $access,
|
||||
'directory' => $id,
|
||||
'view' => $view,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1152,3 +1152,13 @@ cadoles_portal_user_panelwidget_view_onlydoc:
|
|||
path: /pagewidget/view/onlydoc/{id}
|
||||
defaults: { _controller: CadolesPortalBundle:Pagewidget:viewonlydoc, access: user }
|
||||
|
||||
|
||||
#== FRAME ==========================================================================================================================================
|
||||
|
||||
cadoles_portal_config_frame_only:
|
||||
path: /config/frame/only/{directory}
|
||||
defaults: { _controller: CadolesPortalBundle:Frame:only, access: config }
|
||||
|
||||
cadoles_portal_user_frame_only:
|
||||
path: /pagewidget/frame/only/{directory}
|
||||
defaults: { _controller: CadolesPortalBundle:Frame:only, access: user }
|
||||
|
|
|
|||
|
|
@ -36,10 +36,6 @@
|
|||
<i class="fa fa-trash fa-fw" title="Supprimer le Widget" onClick="delWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>
|
||||
<i class="fa fa-file fa-fw" title="Modifier le Widget" onClick="modWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>
|
||||
{% endif %}
|
||||
|
||||
{% if canadd %}
|
||||
<!-- <a style="{{ stylewidgetmenu }}" data-toggle="modal" data-target="#mymodal" onClick="ModalLoad('mymodal','Fichiers','{{ path('cadoles_core_'~access~'_file_upload',{'id': 'widget-'~entity.id,'type':'all'}) }}');" title='Ajouter des Fichiers'><i class="fa fa-plus fa-fw"></i></a> -->
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
{% set stylewidgetheader = constants.mystylewidgetheader(entity) %}
|
||||
{% set stylewidgetbody = constants.mystylewidgetbody(entity) %}
|
||||
{% set stylewidgetbodyreverse = constants.mystylewidgetbodyreverse(entity) %}
|
||||
{% set stylewidgetbodyframe = constants.mystylewidgetbodyframe(entity) %}
|
||||
|
||||
{% set color = app.session.get('color') %}
|
||||
|
||||
|
|
@ -20,9 +21,13 @@
|
|||
|
||||
|
||||
{% set colorbodyfont = entity.colorbodyfont %}
|
||||
{% if colorbodyfont is null %}
|
||||
{% if entity.border and colorbodyfont is null %}
|
||||
{% set colorbodyfont = color['fontcolorhover'] %}
|
||||
{% endif %}
|
||||
{% if colorbodyfont is null %}
|
||||
{% set colorbodyfont = color['main'] %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-file" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
|
||||
{% if canupdate or canadd %}
|
||||
|
|
@ -31,10 +36,6 @@
|
|||
<i class="fa fa-trash fa-fw" title="Supprimer le Widget" onClick="delWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>
|
||||
<i class="fa fa-file fa-fw" title="Modifier le Widget" onClick="modWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>
|
||||
{% endif %}
|
||||
|
||||
{% if canadd %}
|
||||
<a style="{{ stylewidgetmenu }}" href="{{urlonly}}" target="_blank" title='Plus de fonctionnalités'><i class="fa fa-plus fa-fw"></i></a>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
|
@ -48,82 +49,11 @@
|
|||
<span class="title">{{ entity.name }}</span>
|
||||
</div>
|
||||
|
||||
{% if files|length >= 1 or canupdate %}
|
||||
<div class="widgetbody" style="{{ stylewidgetbody }}">
|
||||
{% if apponly==0 %}
|
||||
<div style='width:90%; margin:auto;'>
|
||||
<h4 style='margin-bottom:5px;border-bottom:1px solid;'>Documents</h4>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="widgetbody" style="{{ stylewidgetbodyframe }}">
|
||||
|
||||
{% if apponly==0 or apponly==1 %}
|
||||
<div class="grid clearfix">
|
||||
<div class="grid-sizer grid-small"></div>
|
||||
<div class="grid-gutter-sizer"></div>
|
||||
<iframe id="frame-{{directory}}" src="{{ path("cadoles_portal_"~access~"_frame_only",{'directory':directory,'defaultview':view}) }}" data-color="#{{colorbodyfont}}" style="{{ stylewidgetbodyframe }}" class="{% if not entity.autoajust %}notframeajust {% endif %}"></iframe>
|
||||
|
||||
{% for file in files %}
|
||||
<div class="grid-item grid-small">
|
||||
<div class="grid-item-content">
|
||||
<a href="{{ file.webUrl }}" target="_blank">
|
||||
<div class="item-link clearfix">
|
||||
<div class="grid-item-logo">
|
||||
{% if file.fileExst ==".png" or file.fileExst ==".jpg" or file.fileExst ==".jpeg" or file.fileExst ==".svg" or file.fileExst ==".gif"%}
|
||||
<img class="grid-item-img" height="110" src="{{file.viewUrl}}">
|
||||
{% else %}
|
||||
<img class="grid-item-img" height="110" src="/{{ alias }}/bundles/cadolescore/images/files/{{ file.fileExst | replace({".":""})}}.png">
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="grid-item-title">
|
||||
<h2 style="color:#{{colorbodyfont}}">{{ file.title }}</h2>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
{% if canadd %}
|
||||
<div class="grid-item grid-small">
|
||||
<div class="grid-item-content">
|
||||
<a href="{{urlonly}}" target="_blank" title='Plus de fonctionnalités'>
|
||||
<div class="item-link clearfix">
|
||||
<div class="grid-item-logo">
|
||||
<img class="grid-item-img" height="110" src="/{{ alias }}/uploads/icon/icon_add.png">
|
||||
</div>
|
||||
<div class="grid-item-title">
|
||||
<h2>Plus</h2>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{%endif%}
|
||||
|
||||
{% if not tasks is empty %}
|
||||
<div style='width:90%; margin:auto;'>
|
||||
{% if apponly==0 %}
|
||||
<h4 style='margin-bottom:5px;border-bottom:1px solid;'>Tâches</h4>
|
||||
{%endif%}
|
||||
|
||||
{% if apponly==0 or apponly==2 %}
|
||||
{% for task in tasks %}
|
||||
<li>{{ task.title }}</li>
|
||||
{% if not task.subtasks is empty %}
|
||||
<ul>
|
||||
{% for subtask in task.subtasks %}
|
||||
<li>{{ subtask.title }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{%endif%}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -36,9 +36,9 @@ class onlyService
|
|||
}
|
||||
}
|
||||
|
||||
public function getDocument($idgroup,&$folders,&$firstfolder,&$tasks) {
|
||||
public function getDocument($idgroup,&$firstfolder,&$parents,&$tasks) {
|
||||
$files=[];
|
||||
$folders=[];
|
||||
$parents=[];
|
||||
$tasks=[];
|
||||
|
||||
if(!is_null($idgroup)) {
|
||||
|
|
@ -48,24 +48,29 @@ class onlyService
|
|||
if($this->authOnly()) {
|
||||
$response = \Unirest\Request::get($this->only_url.'/project/'.$group->getIdonlyoffice(),$this->headers);
|
||||
if(!$this->koresponse($response)) {
|
||||
$firstfolder=$response->body->response->projectFolder;;
|
||||
$home=$response->body->response->projectFolder;
|
||||
if(!$firstfolder) $firstfolder=$response->body->response->projectFolder;
|
||||
|
||||
$response = \Unirest\Request::get($this->only_url.'/project/'.$group->getIdonlyoffice().'/files',$this->headers);
|
||||
if(!$this->koresponse($response)) {
|
||||
foreach($response->body->response->files as $fileonly) {
|
||||
array_push($files,$fileonly);
|
||||
}
|
||||
foreach($response->body->response->folders as $folderonly) {
|
||||
$folders[$folderonly->id]=$folderonly;
|
||||
$subfolder=$this->scanfolder($folderonly->id,$folders,$this->headers);
|
||||
foreach($subfolder as $file) {
|
||||
array_push($files,$file);
|
||||
}
|
||||
}
|
||||
$files[$firstfolder] = $this->scanfolder($firstfolder,"",$this->headers);
|
||||
|
||||
// Construction du tableau des parents
|
||||
$currentchild=$firstfolder;
|
||||
|
||||
while($currentchild!=$home) {
|
||||
$response = \Unirest\Request::get($this->only_url.'/files/'.$currentchild,$this->headers);
|
||||
if($this->koresponse($response)) return 0;
|
||||
|
||||
// Récupérer les informations du folder
|
||||
$tmp=["id"=>$response->body->response->current->id,"name"=>$response->body->response->current->title];
|
||||
array_push($parents,$tmp);
|
||||
|
||||
// Aller sur le folder parent
|
||||
$currentchild=$response->body->response->current->parentId;
|
||||
}
|
||||
|
||||
$response = \Unirest\Request::get($this->only_url.'/project/'.$group->getIdonlyoffice().'/task/open',$this->headers);
|
||||
if(!$this->koresponse($response)) $tasks=$response->body->response;
|
||||
}
|
||||
if(!$this->koresponse($response)) $tasks=$response->body->response;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -75,6 +80,10 @@ class onlyService
|
|||
return $files;
|
||||
}
|
||||
|
||||
private function getFiles($idfolder) {
|
||||
|
||||
return $files;
|
||||
}
|
||||
private function authOnly() {
|
||||
// Only Office est-il dans le domaine
|
||||
if(stripos($this->only_url,"/")===0)
|
||||
|
|
@ -119,19 +128,15 @@ class onlyService
|
|||
if($this->debug) error_log($texte);
|
||||
}
|
||||
|
||||
private function scanfolder($folderid,&$folders,$headers) {
|
||||
$files=[];
|
||||
private function scanfolder($folderid,$folderonly,$headers) {
|
||||
$files=["info"=>$folderonly,"files"=>[],"folders"=>[]];
|
||||
$response = \Unirest\Request::get($this->only_url.'/files/'.$folderid,$headers);
|
||||
if($this->koresponse($response)) return 0;
|
||||
foreach($response->body->response->files as $fileonly) {
|
||||
array_push($files,$fileonly);
|
||||
array_push($files["files"],$fileonly);
|
||||
}
|
||||
foreach($response->body->response->folders as $folderonly) {
|
||||
$folders['"'.$folderonly->id.'"']=$folderonly;
|
||||
$subfolder=$this->scanfolder($folderonly->id,$folders,$headers);
|
||||
foreach($subfolder as $file) {
|
||||
array_push($files,$file);
|
||||
}
|
||||
$files["folders"][$folderonly->id] = $this->scanfolder($folderonly->id,$folderonly,$headers);
|
||||
}
|
||||
|
||||
return $files;
|
||||
|
|
|
|||
Loading…
Reference in New Issue