TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support to extend query on 'nested' sortMode - refs #1519 

Recompile assets, minor cleanup
This commit is contained in:
Samuel Georges 2015-10-17 12:44:16 +11:00
parent f0b4691168
commit 5c294b78bd
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/backend/behaviors/ReorderController.php
View File

@ -211,16 +211,20 @@ class ReorderController extends ControllerBehavior
*/
protected function getRecords()
{
$model = $this->controller->reorderGetModel();
$records = null;
$model = $this->controller->reorderGetModel();
$query = $model->newQuery();
$this->controller->reorderExtendQuery($query);
if ($this->sortMode == 'simple') {
$records = $model->orderBy($model->getSortOrderColumn());
$this->controller->reorderExtendQuery($records);
$records = $records->get();
$records = $query
->orderBy($model->getSortOrderColumn())
->get()
;
}
elseif ($this->sortMode == 'nested') {
$records = $model->getEagerRoot();
$records = $query->getNested();
}
return $records;

3
modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js vendored
View File

@ -300,8 +300,7 @@ MediaManager.prototype.showUploadUi=function(){this.$el.find('[data-control="upl
MediaManager.prototype.hideUploadUi=function(){this.$el.find('[data-control="upload-ui"]').addClass('hide')}
MediaManager.prototype.uploadUpdateTotalProgress=function(uploadProgress,totalBytes,totalBytesSent){this.setUploadProgress(uploadProgress)
var fileNumberLabel=this.$el.get(0).querySelector('[data-label="file-number-and-progress"]'),messageTemplate=fileNumberLabel.getAttribute('data-message-template'),fileNumber=this.dropzone.getUploadingFiles().length+this.dropzone.getQueuedFiles().length
if(uploadProgress>=100)
uploadProgress=99
if(uploadProgress>=100){uploadProgress=99}
fileNumberLabel.innerHTML=messageTemplate.replace(':number',fileNumber).replace(':percents',Math.round(uploadProgress)+'%')}
MediaManager.prototype.setUploadProgress=function(value){var progressBar=this.$el.get(0).querySelector('[data-control="upload-progress-bar"]')
progressBar.setAttribute('style','width: '+value+'%')

12
modules/cms/widgets/mediamanager/assets/js/mediamanager.js
View File

@ -764,12 +764,13 @@
messageTemplate = fileNumberLabel.getAttribute('data-message-template'),
fileNumber = this.dropzone.getUploadingFiles().length + this.dropzone.getQueuedFiles().length
// Don't confuse users with displaying 100%
// Don't confuse users with displaying 100%
// until the operation finishes. We consider the operation
// finished when the Dropzone's 'compete' event triggers -
// finished when the Dropzone's 'compete' event triggers -
// when the response is received from the server.
if (uploadProgress >= 100)
if (uploadProgress >= 100) {
uploadProgress = 99
}
fileNumberLabel.innerHTML = messageTemplate.replace(':number', fileNumber).replace(':percents', Math.round(uploadProgress) + '%')
}
@ -808,12 +809,11 @@
}
MediaManager.prototype.uploadSuccess = function() {
this.updateUploadBar('success', 'progress-bar progress-bar-success');
this.updateUploadBar('success', 'progress-bar progress-bar-success');
}
MediaManager.prototype.uploadError = function(file, message) {
this.updateUploadBar('error', 'progress-bar progress-bar-danger');
this.updateUploadBar('error', 'progress-bar progress-bar-danger');
$.oc.alert('Error uploading file')
}