kopia lustrzana https://github.com/OpenDroneMap/WebODM
Minor fixes, version change
rodzic
85ed5433d0
commit
06e686241e
|
@ -9,8 +9,6 @@ import {
|
||||||
} from 'react-router-dom';
|
} from 'react-router-dom';
|
||||||
import $ from 'jquery';
|
import $ from 'jquery';
|
||||||
|
|
||||||
console.log(React.version);
|
|
||||||
|
|
||||||
class Dashboard extends React.Component {
|
class Dashboard extends React.Component {
|
||||||
constructor(){
|
constructor(){
|
||||||
super();
|
super();
|
||||||
|
|
|
@ -314,13 +314,17 @@ class TaskListItem extends React.Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let data = {
|
||||||
|
options: task.options
|
||||||
|
};
|
||||||
|
|
||||||
|
// Force reprocess
|
||||||
|
if (value === null) data.uuid = '';
|
||||||
|
|
||||||
return $.ajax({
|
return $.ajax({
|
||||||
url: `/api/projects/${task.project}/tasks/${task.id}/`,
|
url: `/api/projects/${task.project}/tasks/${task.id}/`,
|
||||||
contentType: 'application/json',
|
contentType: 'application/json',
|
||||||
data: JSON.stringify({
|
data: JSON.stringify(data),
|
||||||
options: task.options
|
|
||||||
}),
|
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
type: 'PATCH'
|
type: 'PATCH'
|
||||||
}).done((taskJson) => {
|
}).done((taskJson) => {
|
||||||
|
@ -396,8 +400,13 @@ class TaskListItem extends React.Component {
|
||||||
|
|
||||||
if ([statusCodes.FAILED, statusCodes.COMPLETED, statusCodes.CANCELED].indexOf(task.status) !== -1 &&
|
if ([statusCodes.FAILED, statusCodes.COMPLETED, statusCodes.CANCELED].indexOf(task.status) !== -1 &&
|
||||||
task.processing_node){
|
task.processing_node){
|
||||||
|
// By default restart reruns every pipeline
|
||||||
|
// step from the beginning
|
||||||
|
const rerunFrom = task.can_rerun_from.length > 1 ?
|
||||||
|
task.can_rerun_from[1] :
|
||||||
|
null;
|
||||||
|
|
||||||
addActionButton("Restart", "btn-primary", "glyphicon glyphicon-repeat", this.genRestartAction(), {
|
addActionButton("Restart", "btn-primary", "glyphicon glyphicon-repeat", this.genRestartAction(rerunFrom), {
|
||||||
subItems: this.getRestartSubmenuItems()
|
subItems: this.getRestartSubmenuItems()
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,5 +5,5 @@ global.requestAnimationFrame = function(callback) {
|
||||||
|
|
||||||
import $ from 'jquery';
|
import $ from 'jquery';
|
||||||
|
|
||||||
// Bootstrap polyfills
|
// Bootstrap mocks
|
||||||
$.prototype.modal = () => {};
|
$.prototype.modal = () => {};
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "WebODM",
|
"name": "WebODM",
|
||||||
"version": "0.4.1",
|
"version": "0.4.2",
|
||||||
"description": "Open Source Drone Image Processing",
|
"description": "Open Source Drone Image Processing",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
Ładowanie…
Reference in New Issue