Skip to content
Snippets Groups Projects
Commit ddbcc8ce authored by Sebastien's avatar Sebastien
Browse files

disallow project deletion

parent 884c2e04
Branches
Tags
1 merge request!62Tuleap 146 a project can be deleted it should not
...@@ -70,3 +70,4 @@ LEGACY_EXTERNAL_PREFIX=/legacy ...@@ -70,3 +70,4 @@ LEGACY_EXTERNAL_PREFIX=/legacy
MEMBER_URL_EXTERNAL=http://localhost:8081/ MEMBER_URL_EXTERNAL=http://localhost:8081/
FRONT_URL_EXTERNAL=http://localhost:8081/ FRONT_URL_EXTERNAL=http://localhost:8081/
LEGACY_PROJECT_DELETION_ENABLED=false
\ No newline at end of file
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
<script language="javascript" type='text/javascript' src='../shared/js/libs/fastdom.js'></script> <script language="javascript" type='text/javascript' src='../shared/js/libs/fastdom.js'></script>
<script language="javascript" type='text/javascript' src='../shared/js/libs/moment-with-langs.min.js'></script> <script language="javascript" type='text/javascript' src='../shared/js/libs/moment-with-langs.min.js'></script>
<script type="module" src="../shared/php/rekallApp.js.php"></script>
<script language="javascript" type='text/javascript' src='../shared/js/rekall/Utils.js'></script> <script language="javascript" type='text/javascript' src='../shared/js/rekall/Utils.js'></script>
<script language="javascript" type='text/javascript' src='../shared/js/online-rekall/Rekall.js'></script> <script language="javascript" type='text/javascript' src='../shared/js/online-rekall/Rekall.js'></script>
<script language="javascript" type='text/javascript' src='../shared/js/rekall/Source.js'></script> <script language="javascript" type='text/javascript' src='../shared/js/rekall/Source.js'></script>
...@@ -38,7 +40,6 @@ ...@@ -38,7 +40,6 @@
<script language="javascript" type='text/javascript' src='../shared/js/iannix.js'></script> <script language="javascript" type='text/javascript' src='../shared/js/iannix.js'></script>
<script language="javascript" type='text/javascript' src='../shared/js/online-script.js'></script> <script language="javascript" type='text/javascript' src='../shared/js/online-script.js'></script>
<script type="module" src="../shared/php/rekallApp.js.php"></script>
<script language="javascript" type='text/javascript' src="../shared/js/libs/video-js/video.min.js"></script> <script language="javascript" type='text/javascript' src="../shared/js/libs/video-js/video.min.js"></script>
<link rel="stylesheet" type="text/css" href="../shared/js/libs/video-js/video-js.min.css" /> <link rel="stylesheet" type="text/css" href="../shared/js/libs/video-js/video-js.min.css" />
...@@ -244,6 +245,7 @@ ...@@ -244,6 +245,7 @@
</div> </div>
</tr></td> </tr></td>
</table> </table>
<div style="width: 100%; height: 30px; background: black"></div>
<video id="video" class="video-js vjs-default-skin vjs-big-play-centered"> <video id="video" class="video-js vjs-default-skin vjs-big-play-centered">
<p class="vjs-no-js">Your browser is not compatible with HTML5. Please upgrade!</p> <p class="vjs-no-js">Your browser is not compatible with HTML5. Please upgrade!</p>
<!-- <!--
......
...@@ -22,12 +22,55 @@ ...@@ -22,12 +22,55 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
function Rekall() { function Rekall(options) {
this.sortings = new Object(); this.sortings = new Object();
this.sortings["horizontal"] = new Sorting("Time"); this.sortings["horizontal"] = new Sorting("Time");
this.sortings["colors"] = new Sorting("Rekall->Type", false, ""); this.sortings["colors"] = new Sorting("Rekall->Type", false, "");
this.timeline = new Timeline(); this.timeline = new Timeline();
this.videoPlayer = undefined; this.videoPlayer = undefined;
function getDefaultBaseUrl() {
var oldURL = window.document.location + "";
var url = oldURL;
var index = 0;
url = url.replace("pro-index.html", "");
url = url.replace("online-index.html", "");
url = url.replace("index.html", "");
index = oldURL.indexOf('?');
if(index == -1)
index = oldURL.indexOf('#');
if(index != -1)
url = oldURL.substring(0, index);
if(!url.endsWith("/"))
url = url + "/";
if(window.location.host == "dev3.memorekall.com") {
url = url.replace("dev3.memorekall.com", "dev2.memorekall.com");
}
if(window.location.host == "legacy.memorekall.com") {
url = url.replace("legacy.memorekall.com", "project.memorekall.com");
}
if(window.location.host == "legacy.memorekall.fr") {
url = url.replace("legacy.memorekall.fr", "project.memorekall.com");
}
return url;
}
var defaultSettings = {
_allowProjectDeletion: false,
baseUrl: getDefaultBaseUrl()
}
this.Settings = $.extend({}, defaultSettings, options);
}
Rekall.prototype.enableProjectDeletion = function() {
this.Settings.allowProjectDeletion = true;
}
Rekall.prototype.disableProjectDeletion = function() {
this.Settings.allowProjectDeletion = false;
} }
Rekall.prototype.loadXMLFile = function() { Rekall.prototype.loadXMLFile = function() {
...@@ -44,6 +87,11 @@ Rekall.prototype.loadXMLFile = function() { ...@@ -44,6 +87,11 @@ Rekall.prototype.loadXMLFile = function() {
url = oldURL.substring(0, index); url = oldURL.substring(0, index);
if(!url.endsWith("/")) if(!url.endsWith("/"))
url = url + "/"; url = url + "/";
if(!this.Settings._allowProjectDeletion){
$('#popupSettingsBtnDelete').hide();
};
if(window.location.host == "dev3.memorekall.com") { if(window.location.host == "dev3.memorekall.com") {
url = url.replace("dev3.memorekall.com", "dev2.memorekall.com"); url = url.replace("dev3.memorekall.com", "dev2.memorekall.com");
$("#popupSettingsBtnDelete").hide(); $("#popupSettingsBtnDelete").hide();
......
var rekall = new Rekall(); var rekall = new Rekall();
var rekall_common = new Object(); var rekall_common = new Object();
$(document).ready(function() { $(document).ready(function() {
rekall.Settings.ProjectDeletionEnabled = window.app.ProjectDeletionEnabled;
Utils.actionPrefix = "php/"; Utils.actionPrefix = "php/";
Utils.actionSuffix = ".php?r="; Utils.actionSuffix = ".php?r=";
...@@ -131,8 +133,6 @@ $(document).ready(function() { ...@@ -131,8 +133,6 @@ $(document).ready(function() {
var tmp = shareLink(); var tmp = shareLink();
openAlert("input",tmp); openAlert("input",tmp);
}); });
}); });
function setEditionControls() { function setEditionControls() {
...@@ -535,8 +535,6 @@ function setEditionControls() { ...@@ -535,8 +535,6 @@ function setEditionControls() {
$("#popupEditSupprimer").click(function(){ $("#popupEditSupprimer").click(function(){
openAlert("Do you really want to delete this file from the project ?", "yesnodelete"); openAlert("Do you really want to delete this file from the project ?", "yesnodelete");
}); });
} }
/*var rubanTimeout = 0; /*var rubanTimeout = 0;
......
...@@ -3,8 +3,8 @@ Header("content-type: application/x-javascript"); ...@@ -3,8 +3,8 @@ Header("content-type: application/x-javascript");
$front_url = $_ENV["FRONT_URL_EXTERNAL"]; $front_url = $_ENV["FRONT_URL_EXTERNAL"];
$member_url = $_ENV["MEMBER_URL_EXTERNAL"]; $member_url = $_ENV["MEMBER_URL_EXTERNAL"];
$project_allow_deletion = isset($_ENV["LEGACY_PROJECT_DELETION_ENABLED"]) && $_ENV["LEGACY_PROJECT_DELETION_ENABLED"] == 'true';
?> ?>
function RekallApp (opts = {}){ function RekallApp (opts = {}){
const METHODS = [ const METHODS = [
'openUrl', 'openUrl',
...@@ -18,10 +18,10 @@ function RekallApp (opts = {}){ ...@@ -18,10 +18,10 @@ function RekallApp (opts = {}){
return; return;
window.top.location.assign(arguments[0]); window.top.location.assign(arguments[0]);
}, },
pubSub: new function(PubSub){ pubSub: function(PubSub){
return window.PubSub; return window.PubSub;
}, },
init: new function(PubSub){ init: function(PubSub){
window.PubSub = PubSub; window.PubSub = PubSub;
} }
}; };
...@@ -54,5 +54,10 @@ function RekallApp (opts = {}){ ...@@ -54,5 +54,10 @@ function RekallApp (opts = {}){
frontHome : '<?= $front_url ?>', frontHome : '<?= $front_url ?>',
memberHome : '<?= $member_url ?>', memberHome : '<?= $member_url ?>',
}; };
app.Settings = {
Project: {
ProjectDeletionEnabled: <?= $project_allow_deletion ?>,
}
};
return app; return app;
})(window.app = window.app || {}); })(window.app = window.app || {});
...@@ -35,6 +35,7 @@ services: ...@@ -35,6 +35,7 @@ services:
environment: environment:
- MEMBER_URL_EXTERNAL - MEMBER_URL_EXTERNAL
- FRONT_URL_EXTERNAL - FRONT_URL_EXTERNAL
- LEGACY_PROJECT_DELETION_ENABLED
volumes: volumes:
- $PWD/legacy:/sites/memorekall/www/web_legacy:rw - $PWD/legacy:/sites/memorekall/www/web_legacy:rw
- $PWD/log:/sites/memorekall/www/log:rw - $PWD/log:/sites/memorekall/www/log:rw
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment