Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • infrastruktur/warpinfra
  • dray/warpinfra
  • HoelShare/warpinfra
3 results
Show changes
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 253 additions and 9730 deletions
www/web/static/admin/js/inlines.js deleted 100644 → 0
View file @ f67f8a0b
/*global DateTimeShortcuts, SelectFilter*/
/**
* Django admin inlines
*
* Based on jQuery Formset 1.1
* @author Stanislaus Madueke (stan DOT madueke AT gmail DOT com)
* @requires jQuery 1.2.6 or later
*
* Copyright (c) 2009, Stanislaus Madueke
* All rights reserved.
*
* Spiced up with Code from Zain Memon's GSoC project 2009
* and modified for Django by Jannis Leidel, Travis Swicegood and Julien Phalip.
*
* Licensed under the New BSD License
* See: http://www.opensource.org/licenses/bsd-license.php
*/
(function($) {
'use strict';
$.fn.formset = function(opts) {
var options = $.extend({}, $.fn.formset.defaults, opts);
var $this = $(this);
var $parent = $this.parent();
var updateElementIndex = function(el, prefix, ndx) {
var id_regex = new RegExp("(" + prefix + "-(\\d+|__prefix__))");
var replacement = prefix + "-" + ndx;
if ($(el).prop("for")) {
$(el).prop("for", $(el).prop("for").replace(id_regex, replacement));
}
if (el.id) {
el.id = el.id.replace(id_regex, replacement);
}
if (el.name) {
el.name = el.name.replace(id_regex, replacement);
}
};
var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").prop("autocomplete", "off");
var nextIndex = parseInt(totalForms.val(), 10);
var maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").prop("autocomplete", "off");
// only show the add button if we are allowed to add more items,
// note that max_num = None translates to a blank string.
var showAddButton = maxForms.val() === '' || (maxForms.val() - totalForms.val()) > 0;
$this.each(function(i) {
$(this).not("." + options.emptyCssClass).addClass(options.formCssClass);
});
if ($this.length && showAddButton) {
var addButton;
if ($this.prop("tagName") === "TR") {
// If forms are laid out as table rows, insert the
// "add" button in a new table row:
var numCols = this.eq(-1).children().length;
$parent.append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="javascript:void(0)">' + options.addText + "</a></tr>");
addButton = $parent.find("tr:last a");
} else {
// Otherwise, insert it immediately after the last form:
$this.filter(":last").after('<div class="' + options.addCssClass + '"><a href="javascript:void(0)">' + options.addText + "</a></div>");
addButton = $this.filter(":last").next().find("a");
}
addButton.click(function(e) {
e.preventDefault();
var template = $("#" + options.prefix + "-empty");
var row = template.clone(true);
row.removeClass(options.emptyCssClass)
.addClass(options.formCssClass)
.attr("id", options.prefix + "-" + nextIndex);
if (row.is("tr")) {
// If the forms are laid out in table rows, insert
// the remove button into the last table cell:
row.children(":last").append('<div><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText + "</a></div>");
} else if (row.is("ul") || row.is("ol")) {
// If they're laid out as an ordered/unordered list,
// insert an <li> after the last list item:
row.append('<li><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText + "</a></li>");
} else {
// Otherwise, just insert the remove button as the
// last child element of the form's container:
row.children(":first").append('<span><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText + "</a></span>");
}
row.find("*").each(function() {
updateElementIndex(this, options.prefix, totalForms.val());
});
// Insert the new form when it has been fully edited
row.insertBefore($(template));
// Update number of total forms
$(totalForms).val(parseInt(totalForms.val(), 10) + 1);
nextIndex += 1;
// Hide add button in case we've hit the max, except we want to add infinitely
if ((maxForms.val() !== '') && (maxForms.val() - totalForms.val()) <= 0) {
addButton.parent().hide();
}
// The delete button of each row triggers a bunch of other things
row.find("a." + options.deleteCssClass).click(function(e1) {
e1.preventDefault();
// Remove the parent form containing this button:
row.remove();
nextIndex -= 1;
// If a post-delete callback was provided, call it with the deleted form:
if (options.removed) {
options.removed(row);
}
$(document).trigger('formset:removed', [row, options.prefix]);
// Update the TOTAL_FORMS form count.
var forms = $("." + options.formCssClass);
$("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length);
// Show add button again once we drop below max
if ((maxForms.val() === '') || (maxForms.val() - forms.length) > 0) {
addButton.parent().show();
}
// Also, update names and ids for all remaining form controls
// so they remain in sequence:
var i, formCount;
var updateElementCallback = function() {
updateElementIndex(this, options.prefix, i);
};
for (i = 0, formCount = forms.length; i < formCount; i++) {
updateElementIndex($(forms).get(i), options.prefix, i);
$(forms.get(i)).find("*").each(updateElementCallback);
}
});
// If a post-add callback was supplied, call it with the added form:
if (options.added) {
options.added(row);
}
$(document).trigger('formset:added', [row, options.prefix]);
});
}
return this;
};
/* Setup plugin defaults */
$.fn.formset.defaults = {
prefix: "form", // The form prefix for your django formset
addText: "add another", // Text for the add link
deleteText: "remove", // Text for the delete link
addCssClass: "add-row", // CSS class applied to the add link
deleteCssClass: "delete-row", // CSS class applied to the delete link
emptyCssClass: "empty-row", // CSS class applied to the empty row
formCssClass: "dynamic-form", // CSS class applied to each form in a formset
added: null, // Function called each time a new form is added
removed: null // Function called each time a form is deleted
};
// Tabular inlines ---------------------------------------------------------
$.fn.tabularFormset = function(options) {
var $rows = $(this);
var alternatingRows = function(row) {
$($rows.selector).not(".add-row").removeClass("row1 row2")
.filter(":even").addClass("row1").end()
.filter(":odd").addClass("row2");
};
var reinitDateTimeShortCuts = function() {
// Reinitialize the calendar and clock widgets by force
if (typeof DateTimeShortcuts !== "undefined") {
$(".datetimeshortcuts").remove();
DateTimeShortcuts.init();
}
};
var updateSelectFilter = function() {
// If any SelectFilter widgets are a part of the new form,
// instantiate a new SelectFilter instance for it.
if (typeof SelectFilter !== 'undefined') {
$('.selectfilter').each(function(index, value) {
var namearr = value.name.split('-');
SelectFilter.init(value.id, namearr[namearr.length - 1], false);
});
$('.selectfilterstacked').each(function(index, value) {
var namearr = value.name.split('-');
SelectFilter.init(value.id, namearr[namearr.length - 1], true);
});
}
};
var initPrepopulatedFields = function(row) {
row.find('.prepopulated_field').each(function() {
var field = $(this),
input = field.find('input, select, textarea'),
dependency_list = input.data('dependency_list') || [],
dependencies = [];
$.each(dependency_list, function(i, field_name) {
dependencies.push('#' + row.find('.field-' + field_name).find('input, select, textarea').attr('id'));
});
if (dependencies.length) {
input.prepopulate(dependencies, input.attr('maxlength'));
}
});
};
$rows.formset({
prefix: options.prefix,
addText: options.addText,
formCssClass: "dynamic-" + options.prefix,
deleteCssClass: "inline-deletelink",
deleteText: options.deleteText,
emptyCssClass: "empty-form",
removed: alternatingRows,
added: function(row) {
initPrepopulatedFields(row);
reinitDateTimeShortCuts();
updateSelectFilter();
alternatingRows(row);
}
});
return $rows;
};
// Stacked inlines ---------------------------------------------------------
$.fn.stackedFormset = function(options) {
var $rows = $(this);
var updateInlineLabel = function(row) {
$($rows.selector).find(".inline_label").each(function(i) {
var count = i + 1;
$(this).html($(this).html().replace(/(#\d+)/g, "#" + count));
});
};
var reinitDateTimeShortCuts = function() {
// Reinitialize the calendar and clock widgets by force, yuck.
if (typeof DateTimeShortcuts !== "undefined") {
$(".datetimeshortcuts").remove();
DateTimeShortcuts.init();
}
};
var updateSelectFilter = function() {
// If any SelectFilter widgets were added, instantiate a new instance.
if (typeof SelectFilter !== "undefined") {
$(".selectfilter").each(function(index, value) {
var namearr = value.name.split('-');
SelectFilter.init(value.id, namearr[namearr.length - 1], false);
});
$(".selectfilterstacked").each(function(index, value) {
var namearr = value.name.split('-');
SelectFilter.init(value.id, namearr[namearr.length - 1], true);
});
}
};
var initPrepopulatedFields = function(row) {
row.find('.prepopulated_field').each(function() {
var field = $(this),
input = field.find('input, select, textarea'),
dependency_list = input.data('dependency_list') || [],
dependencies = [];
$.each(dependency_list, function(i, field_name) {
dependencies.push('#' + row.find('.form-row .field-' + field_name).find('input, select, textarea').attr('id'));
});
if (dependencies.length) {
input.prepopulate(dependencies, input.attr('maxlength'));
}
});
};
$rows.formset({
prefix: options.prefix,
addText: options.addText,
formCssClass: "dynamic-" + options.prefix,
deleteCssClass: "inline-deletelink",
deleteText: options.deleteText,
emptyCssClass: "empty-form",
removed: updateInlineLabel,
added: function(row) {
initPrepopulatedFields(row);
reinitDateTimeShortCuts();
updateSelectFilter();
updateInlineLabel(row);
}
});
return $rows;
};
})(django.jQuery);
www/web/static/admin/js/inlines.min.js deleted 100644 → 0
View file @ f67f8a0b
(function(b){b.fn.formset=function(d){var a=b.extend({},b.fn.formset.defaults,d),e=b(this);d=e.parent();var k=function(a,f,l){var c=new RegExp("("+f+"-(\\d+|__prefix__))");f=f+"-"+l;b(a).prop("for")&&b(a).prop("for",b(a).prop("for").replace(c,f));a.id&&(a.id=a.id.replace(c,f));a.name&&(a.name=a.name.replace(c,f))},h=b("#id_"+a.prefix+"-TOTAL_FORMS").prop("autocomplete","off"),l=parseInt(h.val(),10),f=b("#id_"+a.prefix+"-MAX_NUM_FORMS").prop("autocomplete","off"),c=""===f.val()||0<f.val()-h.val();
e.each(function(f){b(this).not("."+a.emptyCssClass).addClass(a.formCssClass)});if(e.length&&c){var m;"TR"===e.prop("tagName")?(e=this.eq(-1).children().length,d.append('<tr class="'+a.addCssClass+'"><td colspan="'+e+'"><a href="javascript:void(0)">'+a.addText+"</a></tr>"),m=d.find("tr:last a")):(e.filter(":last").after('<div class="'+a.addCssClass+'"><a href="javascript:void(0)">'+a.addText+"</a></div>"),m=e.filter(":last").next().find("a"));m.click(function(c){c.preventDefault();c=b("#"+a.prefix+
"-empty");var g=c.clone(!0);g.removeClass(a.emptyCssClass).addClass(a.formCssClass).attr("id",a.prefix+"-"+l);g.is("tr")?g.children(":last").append('<div><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></div>"):g.is("ul")||g.is("ol")?g.append('<li><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></li>"):g.children(":first").append('<span><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></span>");g.find("*").each(function(){k(this,
a.prefix,h.val())});g.insertBefore(b(c));b(h).val(parseInt(h.val(),10)+1);l+=1;""!==f.val()&&0>=f.val()-h.val()&&m.parent().hide();g.find("a."+a.deleteCssClass).click(function(c){c.preventDefault();g.remove();--l;a.removed&&a.removed(g);b(document).trigger("formset:removed",[g,a.prefix]);c=b("."+a.formCssClass);b("#id_"+a.prefix+"-TOTAL_FORMS").val(c.length);(""===f.val()||0<f.val()-c.length)&&m.parent().show();var d,e,h=function(){k(this,a.prefix,d)};d=0;for(e=c.length;d<e;d++)k(b(c).get(d),a.prefix,
d),b(c.get(d)).find("*").each(h)});a.added&&a.added(g);b(document).trigger("formset:added",[g,a.prefix])})}return this};b.fn.formset.defaults={prefix:"form",addText:"add another",deleteText:"remove",addCssClass:"add-row",deleteCssClass:"delete-row",emptyCssClass:"empty-row",formCssClass:"dynamic-form",added:null,removed:null};b.fn.tabularFormset=function(d){var a=b(this),e=function(l){b(a.selector).not(".add-row").removeClass("row1 row2").filter(":even").addClass("row1").end().filter(":odd").addClass("row2")},
k=function(){"undefined"!==typeof SelectFilter&&(b(".selectfilter").each(function(a,b){var c=b.name.split("-");SelectFilter.init(b.id,c[c.length-1],!1)}),b(".selectfilterstacked").each(function(a,b){var c=b.name.split("-");SelectFilter.init(b.id,c[c.length-1],!0)}))},h=function(a){a.find(".prepopulated_field").each(function(){var f=b(this).find("input, select, textarea"),c=f.data("dependency_list")||[],d=[];b.each(c,function(b,c){d.push("#"+a.find(".field-"+c).find("input, select, textarea").attr("id"))});
d.length&&f.prepopulate(d,f.attr("maxlength"))})};a.formset({prefix:d.prefix,addText:d.addText,formCssClass:"dynamic-"+d.prefix,deleteCssClass:"inline-deletelink",deleteText:d.deleteText,emptyCssClass:"empty-form",removed:e,added:function(a){h(a);"undefined"!==typeof DateTimeShortcuts&&(b(".datetimeshortcuts").remove(),DateTimeShortcuts.init());k();e(a)}});return a};b.fn.stackedFormset=function(d){var a=b(this),e=function(d){b(a.selector).find(".inline_label").each(function(a){a+=1;b(this).html(b(this).html().replace(/(#\d+)/g,
"#"+a))})},k=function(){"undefined"!==typeof SelectFilter&&(b(".selectfilter").each(function(a,b){var c=b.name.split("-");SelectFilter.init(b.id,c[c.length-1],!1)}),b(".selectfilterstacked").each(function(a,b){var c=b.name.split("-");SelectFilter.init(b.id,c[c.length-1],!0)}))},h=function(a){a.find(".prepopulated_field").each(function(){var d=b(this).find("input, select, textarea"),c=d.data("dependency_list")||[],e=[];b.each(c,function(b,c){e.push("#"+a.find(".form-row .field-"+c).find("input, select, textarea").attr("id"))});
e.length&&d.prepopulate(e,d.attr("maxlength"))})};a.formset({prefix:d.prefix,addText:d.addText,formCssClass:"dynamic-"+d.prefix,deleteCssClass:"inline-deletelink",deleteText:d.deleteText,emptyCssClass:"empty-form",removed:e,added:function(a){h(a);"undefined"!==typeof DateTimeShortcuts&&(b(".datetimeshortcuts").remove(),DateTimeShortcuts.init());k();e(a)}});return a}})(django.jQuery);
www/web/static/admin/js/urlify.js deleted 100644 → 0
View file @ f67f8a0b
/*global XRegExp*/
(function() {
'use strict';
var LATIN_MAP = {
'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'AE',
'Ç': 'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I',
'Î': 'I', 'Ï': 'I', 'Ð': 'D', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O',
'Õ': 'O', 'Ö': 'O', 'Ő': 'O', 'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U',
'Ü': 'U', 'Ű': 'U', 'Ý': 'Y', 'Þ': 'TH', 'Ÿ': 'Y', 'ß': 'ss', 'à': 'a',
'á': 'a', 'â': 'a', 'ã': 'a', 'ä': 'a', 'å': 'a', 'æ': 'ae', 'ç': 'c',
'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e', 'ì': 'i', 'í': 'i', 'î': 'i',
'ï': 'i', 'ð': 'd', 'ñ': 'n', 'ò': 'o', 'ó': 'o', 'ô': 'o', 'õ': 'o',
'ö': 'o', 'ő': 'o', 'ø': 'o', 'ù': 'u', 'ú': 'u', 'û': 'u', 'ü': 'u',
'ű': 'u', 'ý': 'y', 'þ': 'th', 'ÿ': 'y'
};
var LATIN_SYMBOLS_MAP = {
'©': '(c)'
};
var GREEK_MAP = {
'α': 'a', 'β': 'b', 'γ': 'g', 'δ': 'd', 'ε': 'e', 'ζ': 'z', 'η': 'h',
'θ': '8', 'ι': 'i', 'κ': 'k', 'λ': 'l', 'μ': 'm', 'ν': 'n', 'ξ': '3',
'ο': 'o', 'π': 'p', 'ρ': 'r', 'σ': 's', 'τ': 't', 'υ': 'y', 'φ': 'f',
'χ': 'x', 'ψ': 'ps', 'ω': 'w', 'ά': 'a', 'έ': 'e', 'ί': 'i', 'ό': 'o',
'ύ': 'y', 'ή': 'h', 'ώ': 'w', 'ς': 's', 'ϊ': 'i', 'ΰ': 'y', 'ϋ': 'y',
'ΐ': 'i', 'Α': 'A', 'Β': 'B', 'Γ': 'G', 'Δ': 'D', 'Ε': 'E', 'Ζ': 'Z',
'Η': 'H', 'Θ': '8', 'Ι': 'I', 'Κ': 'K', 'Λ': 'L', 'Μ': 'M', 'Ν': 'N',
'Ξ': '3', 'Ο': 'O', 'Π': 'P', 'Ρ': 'R', 'Σ': 'S', 'Τ': 'T', 'Υ': 'Y',
'Φ': 'F', 'Χ': 'X', 'Ψ': 'PS', 'Ω': 'W', 'Ά': 'A', 'Έ': 'E', 'Ί': 'I',
'Ό': 'O', 'Ύ': 'Y', 'Ή': 'H', 'Ώ': 'W', 'Ϊ': 'I', 'Ϋ': 'Y'
};
var TURKISH_MAP = {
'ş': 's', 'Ş': 'S', 'ı': 'i', 'İ': 'I', 'ç': 'c', 'Ç': 'C', 'ü': 'u',
'Ü': 'U', 'ö': 'o', 'Ö': 'O', 'ğ': 'g', 'Ğ': 'G'
};
var ROMANIAN_MAP = {
'ă': 'a', 'î': 'i', 'ș': 's', 'ț': 't', 'â': 'a',
'Ă': 'A', 'Î': 'I', 'Ș': 'S', 'Ț': 'T', 'Â': 'A'
};
var RUSSIAN_MAP = {
'а': 'a', 'б': 'b', 'в': 'v', 'г': 'g', 'д': 'd', 'е': 'e', 'ё': 'yo',
'ж': 'zh', 'з': 'z', 'и': 'i', 'й': 'j', 'к': 'k', 'л': 'l', 'м': 'm',
'н': 'n', 'о': 'o', 'п': 'p', 'р': 'r', 'с': 's', 'т': 't', 'у': 'u',
'ф': 'f', 'х': 'h', 'ц': 'c', 'ч': 'ch', 'ш': 'sh', 'щ': 'sh', 'ъ': '',
'ы': 'y', 'ь': '', 'э': 'e', 'ю': 'yu', 'я': 'ya',
'А': 'A', 'Б': 'B', 'В': 'V', 'Г': 'G', 'Д': 'D', 'Е': 'E', 'Ё': 'Yo',
'Ж': 'Zh', 'З': 'Z', 'И': 'I', 'Й': 'J', 'К': 'K', 'Л': 'L', 'М': 'M',
'Н': 'N', 'О': 'O', 'П': 'P', 'Р': 'R', 'С': 'S', 'Т': 'T', 'У': 'U',
'Ф': 'F', 'Х': 'H', 'Ц': 'C', 'Ч': 'Ch', 'Ш': 'Sh', 'Щ': 'Sh', 'Ъ': '',
'Ы': 'Y', 'Ь': '', 'Э': 'E', 'Ю': 'Yu', 'Я': 'Ya'
};
var UKRAINIAN_MAP = {
'Є': 'Ye', 'І': 'I', 'Ї': 'Yi', 'Ґ': 'G', 'є': 'ye', 'і': 'i',
'ї': 'yi', 'ґ': 'g'
};
var CZECH_MAP = {
'č': 'c', 'ď': 'd', 'ě': 'e', 'ň': 'n', 'ř': 'r', 'š': 's', 'ť': 't',
'ů': 'u', 'ž': 'z', 'Č': 'C', 'Ď': 'D', 'Ě': 'E', 'Ň': 'N', 'Ř': 'R',
'Š': 'S', 'Ť': 'T', 'Ů': 'U', 'Ž': 'Z'
};
var POLISH_MAP = {
'ą': 'a', 'ć': 'c', 'ę': 'e', 'ł': 'l', 'ń': 'n', 'ó': 'o', 'ś': 's',
'ź': 'z', 'ż': 'z',
'Ą': 'A', 'Ć': 'C', 'Ę': 'E', 'Ł': 'L', 'Ń': 'N', 'Ó': 'O', 'Ś': 'S',
'Ź': 'Z', 'Ż': 'Z'
};
var LATVIAN_MAP = {
'ā': 'a', 'č': 'c', 'ē': 'e', 'ģ': 'g', 'ī': 'i', 'ķ': 'k', 'ļ': 'l',
'ņ': 'n', 'š': 's', 'ū': 'u', 'ž': 'z',
'Ā': 'A', 'Č': 'C', 'Ē': 'E', 'Ģ': 'G', 'Ī': 'I', 'Ķ': 'K', 'Ļ': 'L',
'Ņ': 'N', 'Š': 'S', 'Ū': 'U', 'Ž': 'Z'
};
var ARABIC_MAP = {
'أ': 'a', 'ب': 'b', 'ت': 't', 'ث': 'th', 'ج': 'g', 'ح': 'h', 'خ': 'kh', 'د': 'd',
'ذ': 'th', 'ر': 'r', 'ز': 'z', 'س': 's', 'ش': 'sh', 'ص': 's', 'ض': 'd', 'ط': 't',
'ظ': 'th', 'ع': 'aa', 'غ': 'gh', 'ف': 'f', 'ق': 'k', 'ك': 'k', 'ل': 'l', 'م': 'm',
'ن': 'n', 'ه': 'h', 'و': 'o', 'ي': 'y'
};
var LITHUANIAN_MAP = {
'ą': 'a', 'č': 'c', 'ę': 'e', 'ė': 'e', 'į': 'i', 'š': 's', 'ų': 'u',
'ū': 'u', 'ž': 'z',
'Ą': 'A', 'Č': 'C', 'Ę': 'E', 'Ė': 'E', 'Į': 'I', 'Š': 'S', 'Ų': 'U',
'Ū': 'U', 'Ž': 'Z'
};
var SERBIAN_MAP = {
'ђ': 'dj', 'ј': 'j', 'љ': 'lj', 'њ': 'nj', 'ћ': 'c', 'џ': 'dz',
'đ': 'dj', 'Ђ': 'Dj', 'Ј': 'j', 'Љ': 'Lj', 'Њ': 'Nj', 'Ћ': 'C',
'Џ': 'Dz', 'Đ': 'Dj'
};
var AZERBAIJANI_MAP = {
'ç': 'c', 'ə': 'e', 'ğ': 'g', 'ı': 'i', 'ö': 'o', 'ş': 's', 'ü': 'u',
'Ç': 'C', 'Ə': 'E', 'Ğ': 'G', 'İ': 'I', 'Ö': 'O', 'Ş': 'S', 'Ü': 'U'
};
var ALL_DOWNCODE_MAPS = [
LATIN_MAP,
LATIN_SYMBOLS_MAP,
GREEK_MAP,
TURKISH_MAP,
ROMANIAN_MAP,
RUSSIAN_MAP,
UKRAINIAN_MAP,
CZECH_MAP,
POLISH_MAP,
LATVIAN_MAP,
ARABIC_MAP,
LITHUANIAN_MAP,
SERBIAN_MAP,
AZERBAIJANI_MAP
];
var Downcoder = {
'Initialize': function() {
if (Downcoder.map) { // already made
return;
}
Downcoder.map = {};
Downcoder.chars = [];
for (var i = 0; i < ALL_DOWNCODE_MAPS.length; i++) {
var lookup = ALL_DOWNCODE_MAPS[i];
for (var c in lookup) {
if (lookup.hasOwnProperty(c)) {
Downcoder.map[c] = lookup[c];
}
}
}
for (var k in Downcoder.map) {
if (Downcoder.map.hasOwnProperty(k)) {
Downcoder.chars.push(k);
}
}
Downcoder.regex = new RegExp(Downcoder.chars.join('|'), 'g');
}
};
function downcode(slug) {
Downcoder.Initialize();
return slug.replace(Downcoder.regex, function(m) {
return Downcoder.map[m];
});
}
function URLify(s, num_chars, allowUnicode) {
// changes, e.g., "Petty theft" to "petty-theft"
// remove all these words from the string before urlifying
if (!allowUnicode) {
s = downcode(s);
}
var removelist = [
"a", "an", "as", "at", "before", "but", "by", "for", "from", "is",
"in", "into", "like", "of", "off", "on", "onto", "per", "since",
"than", "the", "this", "that", "to", "up", "via", "with"
];
var r = new RegExp('\\b(' + removelist.join('|') + ')\\b', 'gi');
s = s.replace(r, '');
// if downcode doesn't hit, the char will be stripped here
if (allowUnicode) {
// Keep Unicode letters including both lowercase and uppercase
// characters, whitespace, and dash; remove other characters.
s = XRegExp.replace(s, XRegExp('[^-_\\p{L}\\p{N}\\s]', 'g'), '');
} else {
s = s.replace(/[^-\w\s]/g, ''); // remove unneeded chars
}
s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
s = s.replace(/[-\s]+/g, '-'); // convert spaces to hyphens
s = s.toLowerCase(); // convert to lowercase
return s.substring(0, num_chars); // trim to first num_chars chars
}
window.URLify = URLify;
})();
www/web/static/admin/js/vendor/jquery/jquery.js deleted 100644 → 0
View file @ f67f8a0b
This diff is collapsed.
www/web/static/admin/js/vendor/jquery/jquery.min.js deleted 100644 → 0
View file @ f67f8a0b
This diff is collapsed.
www/web/templates/base.html
View file @ d34c3322
......@@ -71,7 +71,7 @@
{% else %}
<ul class="nav navbar-nav">
<li><a href="/pizza">{% trans "pizza_sheet" %}</a></li>
<li><a href="https://infra.warpzone.ms/pizza">{% trans "pizza_sheet" %}</a></li>
</ul>
{% endif %}
<ul class="nav navbar-nav">
......
www/web/warpapi/views.py
View file @ d34c3322
......@@ -3,6 +3,24 @@ from rest_framework.response import Response
from rest_framework import status
from warpapi.models import Information
# Beispieldaten aus Konfigurationstabelle
# INSERT INTO "warpapi_information" VALUES(1,'api','','0.13');
# INSERT INTO "warpapi_information" VALUES(2,'space','','warpzone');
# INSERT INTO "warpapi_information" VALUES(3,'logo','','https://www.warpzone.ms/api/warpzone_logo.png');
# INSERT INTO "warpapi_information" VALUES(4,'url','','https://www.warpzone.ms');
# INSERT INTO "warpapi_information" VALUES(5,'address','location','warpzone e.V., Am Hawerkamp 31, 48155 Muenster, Germany');
# INSERT INTO "warpapi_information" VALUES(6,'lon','location','7.638216');
# INSERT INTO "warpapi_information" VALUES(7,'lat','location','51.943376');
# INSERT INTO "warpapi_information" VALUES(8,'phone','contact','+49 251 39500271');
# INSERT INTO "warpapi_information" VALUES(9,'twitter','contact','@warpzone_ms');
# INSERT INTO "warpapi_information" VALUES(10,'email','contact','office@warpzone.ms');
# INSERT INTO "warpapi_information" VALUES(11,'irc','contact','irc://irc.freenode.net/#warpzone');
# INSERT INTO "warpapi_information" VALUES(12,'ml','contact','warpzone@warpzone.ms');
# INSERT INTO "warpapi_information" VALUES(13,'issue_mail','contact','c3BhY2VhcGlAd2FycHpvbmUubXM=');
# INSERT INTO "warpapi_information" VALUES(14,'open','icon','https://www.warpzone.ms/api/warpzone_open.png');
# INSERT INTO "warpapi_information" VALUES(15,'closed','icon','https://www.warpzone.ms/api/warpzone_closed.png');
# INSERT INTO "warpapi_information" VALUES(16,'issue_mail','issue_report_channels','');
@api_view(['GET'])
def main(request):
ret= {}
......
www/web/warpauth/migrations/0001_initial.py
View file @ d34c3322
# -*- coding: utf-8 -*-
# Generated by Django 1.9 on 2017-03-14 21:49
# Generated by Django 1.10 on 2017-04-25 21:48
from __future__ import unicode_literals
from django.db import migrations, models
......@@ -14,26 +14,16 @@ class Migration(migrations.Migration):
]
operations = [
migrations.CreateModel(
name='ActivationToken',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('user', models.CharField(max_length=100)),
('email', models.CharField(max_length=100)),
('token', models.CharField(max_length=100)),
('created', models.DateTimeField(auto_now_add=True)),
],
),
migrations.CreateModel(
name='LdapGroup',
fields=[
('dn', models.CharField(max_length=200, primary_key=True, serialize=False)),
('gid', ldapdb.models.fields.IntegerField(db_column='gidNumber', unique=True)),
('gid', ldapdb.models.fields.IntegerField(db_column='gidNumber')),
('name', ldapdb.models.fields.CharField(db_column='cn', max_length=200, primary_key=True, serialize=False)),
('members', ldapdb.models.fields.ListField(db_column='uniqueMember')),
],
options={
'abstract': False,
'managed': False,
},
),
migrations.CreateModel(
......@@ -48,9 +38,19 @@ class Migration(migrations.Migration):
('card_id', ldapdb.models.fields.CharField(db_column='employeeNumber', max_length=200)),
],
options={
'abstract': False,
'managed': False,
},
),
migrations.CreateModel(
name='ActivationToken',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('user', models.CharField(max_length=100)),
('email', models.CharField(max_length=100)),
('token', models.CharField(max_length=100)),
('created', models.DateTimeField(auto_now_add=True)),
],
),
migrations.CreateModel(
name='PasswordResetToken',
fields=[
......
www/web/warpauth/models.py
View file @ d34c3322
......@@ -26,6 +26,9 @@ class ActivationToken(models.Model):
class LdapUser(ldapdb.models.Model):
class Meta:
managed = False
base_dn = "ou=users,dc=warpzone,dc=ms"
object_classes = ['inetOrgPerson']
......@@ -35,7 +38,10 @@ class LdapUser(ldapdb.models.Model):
email = CharField(db_column='mail', max_length=200)
cn = CharField(db_column='cn', max_length=200)
card_id = CharField(db_column='employeeNumber', max_length=200)
pinCode = CharField(db_column='carLicense', max_length=100)
memberof = ListField(db_column='memberOf')
def __str__(self):
return self.uid
......@@ -50,6 +56,9 @@ class LdapUserForm(ModelForm):
class LdapGroup(ldapdb.models.Model):
class Meta:
managed = False
base_dn = "ou=groups,dc=warpzone,dc=ms"
object_classes = ['groupOfUniqueNames']
......
www/web/warpauth/templates/warpauth/profile.html
View file @ d34c3322
......@@ -15,6 +15,9 @@
<li role="presentation">
<a href="#change_passwd" aria-controls="change_passwd" role="tab" data-toggle="tab">{% trans "change_password" %}</a>
</li>
<li role="presentation">
<a href="#warp_pay" aria-controls="warp_pay" role="tab" data-toggle="tab">{% trans "warp_pay" %}</a>
</li>
<li role="presentation">
<a href="/account/two_factor/">{% trans "two_factor_authentication" %}</a>
</li>
......@@ -27,6 +30,9 @@
<div role="tabpanel" class="tab-pane fade in" id="change_passwd">
{% include "warpauth/profile/change_password.html" %}
</div>
<div role="tabpanel" class="tab-pane fade in" id="warp_pay">
{% include "warpauth/profile/warp_pay.html" %}
</div>
</div>
</div>
<script>
......
www/web/warpauth/templates/warpauth/profile/warp_pay.html 0 → 100644
View file @ d34c3322
{% load i18n %}
<div>
<br />
{% if error_warp_pay_settings %}
<div class="alert alert-danger">{{ error_warp_pay_settings }}</div><br>
{% endif %}
{% if success_warp_pay_settings %}
<div class="alert alert-success">{% trans "settings_changed_successful" %}</div><br>
{% endif %}
<form class="form-horizontal" method="POST" action="/account/profile/warp_pay_settings/" role="form">
{% csrf_token %}
<!--<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 " for="id_curr_pw">{% trans "current_password" %}</label>
<div class=" col-sm-10 col-lg-10 ">
<input class=" form-control" id="id_curr_pw" name="curr_pw" type="password" />
</div>
</div>-->
<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 " for="id_new_pin">{% trans "new_pin_code" %}</label>
<div class=" col-sm-10 col-lg-10 ">
<input class=" form-control" id="id_new_pin" name="new_pin" type="password" />
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 " for="id_new_pin_confirm">{% trans "confirm_pin_code" %}</label>
<div class=" col-sm-10 col-lg-10 ">
<input class=" form-control" id="id_new_pin_confirm" name="new_pin_confirm" type="password" />
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button style="float: left" type="submit" formmethod="post" class="btn btn-primary">{% trans "save_settings" %}</button>
</div>
</div>
</form>
</div>
www/web/warpauth/urls.py
View file @ d34c3322
......@@ -14,6 +14,7 @@ urlpatterns = [
url(r'^account/profile/$', profile.index, name='profile_index'),
url(r'^account/profile/change_password/$', profile.change_password, name='change_password'),
url(r'^account/profile/change_information/$', profile.change_information, name='change_information'),
url(r'^account/profile/warp_pay_settings/$', profile.warp_pay_settings, name='warp_pay_settings'),
]
www/web/warpauth/views/profile.py
View file @ d34c3322
......@@ -9,6 +9,7 @@ from warpauth.models import LdapUser, LdapUserForm
from warpauth.util import *
import logging
from django.conf import settings
import bcrypt
##
# http://www.python-ldap.org/doc/html/ldap.html#ldap.LDAPObject
......@@ -26,6 +27,9 @@ def clear_error_messages():
page_context["success_info"] = False
page_context["error_passwd"] = ""
page_context["success_passwd"] = False
page_context["error_warp_pay_settings"] = ""
page_context["success_warp_pay_settings"] = False
page_context["selected_tab"] = ""
......@@ -44,7 +48,6 @@ def change_information(request):
if request.method != 'POST':
return redirect("profile_index")
user = LdapUser.objects.get(uid=str(request.user))
if "first_name" in request.POST:
first_name = request.POST["first_name"]
......@@ -55,7 +58,7 @@ def change_information(request):
card_id = request.POST["card_id"]
else:
card_id = 0
if "email" not in request.POST:
page_context["error_info"] = "err_invalid_email"
return HttpResponse(render(request, 'warpauth/profile.html', page_context))
......@@ -80,7 +83,8 @@ def change_information(request):
user.last_name = last_name
user.cn = cn
user.email = email
user.card_id=card_id
user.card_id = card_id
user.save()
page_context["success_info"] = True
......@@ -88,6 +92,26 @@ def change_information(request):
return HttpResponse(render(request, 'warpauth/profile.html', page_context))
@login_required(login_url=settings.LOGIN_URL, redirect_field_name=None)
def warp_pay_settings(request):
page_context["selected_tab"] = "#warp_pay"
if request.method == 'POST':
user = LdapUser.objects.get(uid=str(request.user))
if request.POST["new_pin"] != "":
# if not "curr_pw" in request.POST or not request.user.check_password(request.POST["curr_pw"]):
# page_context["error_warp_pay_settings"] = "wrong_password"
if request.POST["new_pin"].isnumeric() and request.POST["new_pin"] == request.POST["new_pin_confirm"]:
pin = request.POST["new_pin"].encode('utf-8')
user.pinCode = bcrypt.hashpw(pin, bcrypt.gensalt(10,prefix=b"2a")).decode('utf-8')
user.save()
page_context["success_warp_pay_settings"] = True
else:
page_context["error_warp_pay_settings"] = "pin_repeat_wrong"
set_user_object(request)
return HttpResponse(render(request, 'warpauth/profile.html', page_context))
@login_required(login_url=settings.LOGIN_URL, redirect_field_name=None)
def change_password(request):
clear_error_messages()
......
www/web/warpauth/views/register.py
View file @ d34c3322
......@@ -10,7 +10,8 @@ from warpauth.models import LdapUser, ActivationToken, LdapGroup
from warpauth.util import *
from django.utils.translation import ugettext as _
from django.core.exceptions import ObjectDoesNotExist
from warpzone.settings import INSTANCE_NAME
from django.shortcuts import redirect
def send_token(token):
email_content = _("https://infra.warpzone.ms/account/registration/activate/%(token)s") % {'token': token.token }
......@@ -20,6 +21,8 @@ def send_token(token):
def register(request):
page_context['success'] = False
if "INTERN" in INSTANCE_NAME:
return redirect('http://infra.warpzone.ms/account/registration/')
if request.method == "POST":
username = request.POST['username']
......@@ -73,6 +76,8 @@ def register(request):
def activate(request, token=None):
if "INTERN" in INSTANCE_NAME:
return redirect('http://infra.warpzone.ms/account/registration/')
try:
activation_token = ActivationToken.objects.get(token=token)
group = LdapGroup.objects.filter(name="active").get()
......@@ -85,6 +90,8 @@ def activate(request, token=None):
return HttpResponse(render(request, 'warpauth/register/activate.html', page_context))
def resend_token(request):
if "INTERN" in INSTANCE_NAME:
return redirect('http://infra.warpzone.ms/account/registration/')
if request.method == "POST":
try:
token = ActivationToken.objects.get(user=request.POST["username"])
......
www/web/warpauth/views/reset_password.py
View file @ d34c3322
......@@ -13,14 +13,17 @@ from warpzone.util import send_email
from warpauth.util import *
from warpauth.models import PasswordResetToken, LdapUser
from warpzone.settings import PW_RESET_TOKEN_LIFETIME
from django.shortcuts import redirect
from warpzone.settings import PW_RESET_TOKEN_LIFETIME, INSTANCE_NAME
#
# Function to generate a password reset Token
#
def gen_token(request):
if "INTERN" in INSTANCE_NAME:
return redirect('http://infra.warpzone.ms/account/reset_password/')
if request.POST:
try:
usr = LdapUser.objects.get(uid=request.POST["username"])
......@@ -45,6 +48,8 @@ def gen_token(request):
#
def change_password(request, reset_hash=None):
if "INTERN" in INSTANCE_NAME:
return redirect('http://infra.warpzone.ms/account/reset_password/')
try:
pw_reset_token = PasswordResetToken.objects.get(hash=reset_hash)
time_difference = datetime.datetime.now() - pw_reset_token.created
......
www/web/warppay/migrations/0004_auto_20170425_2211.py 0 → 100644
View file @ d34c3322
# -*- coding: utf-8 -*-
# Generated by Django 1.10 on 2017-04-25 22:11
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('warppay', '0003_auto_20170314_2230'),
]
operations = [
migrations.AddField(
model_name='product',
name='position',
field=models.FloatField(blank=True, default=0, null=True),
),
migrations.AddField(
model_name='productcategory',
name='position',
field=models.FloatField(blank=True, default=0, null=True),
),
migrations.AddField(
model_name='usercredit',
name='pinCode',
field=models.CharField(max_length=100, null=True),
),
migrations.AlterField(
model_name='product',
name='barcode',
field=models.CharField(blank=True, max_length=100, null=True),
),
migrations.AlterField(
model_name='product',
name='stock_count',
field=models.IntegerField(blank=True, default=0, null=True),
),
]
www/web/warppay/models.py
View file @ d34c3322
......@@ -6,21 +6,23 @@ from warpauth.models import LdapUser
class ProductCategory(models.Model):
name = models.CharField(max_length=100, unique=True)
position = models.FloatField(null=True, blank=True, default=0)
def __str__(self):
return self.name
class ProductCategorySerializer(serializers.ModelSerializer):
class Meta:
model = ProductCategory
fields = ['id', 'name']
fields = ['id', 'name','position']
class Product(models.Model):
name = models.CharField(max_length=100, null=True)
price_ek = models.FloatField()
price_vk = models.FloatField()
category = models.ForeignKey(ProductCategory, on_delete=models.CASCADE, null=True)
stock_count = models.IntegerField()
barcode = models.CharField(max_length=100, null=True)
stock_count = models.IntegerField(null=True, blank=True, default=0)
barcode = models.CharField(max_length=100, null=True, blank=True)
position = models.FloatField(null=True, blank=True, default=0)
def __str__(self):
return self.name
......@@ -28,9 +30,10 @@ class Product(models.Model):
class ProductSerializer(serializers.ModelSerializer):
category = serializers.StringRelatedField()
class Meta:
model = Product
fields = ['id', 'name', 'price_vk', 'category', 'stock_count']
fields = ['id', 'name', 'price_vk', 'category', 'barcode','stock_count','position']
class Transaction(models.Model):
......@@ -51,8 +54,9 @@ class TransactionLog(models.Model):
class UserCredit(models.Model):
uid = models.CharField(max_length=100,unique=True)
card_id = models.CharField(max_length=10, null=True) # Unique only with django 1.11
card_id = models.CharField(max_length=255, null=True, blank=True) # Unique only with django 1.11
credit = models.FloatField()
pinCode = models.CharField(max_length=100, blank=True, null=True)
def __str__(self):
return self.uid
......@@ -61,4 +65,4 @@ class UserCredit(models.Model):
class UserCreditSerializer(serializers.ModelSerializer):
class Meta:
model = UserCredit
fields = ['uid', 'card_id', 'credit']
fields = ['uid', 'card_id', 'credit', 'pinCode']
www/web/warppay/urls.py
View file @ d34c3322
......@@ -7,7 +7,8 @@ urlpatterns = [
url(r'^api/users/(?P<user_id>\w+)/$', views.user_list),
url(r'^api/products/$', views.product_list),
url(r'^api/categories/$', views.category_list),
url(r'^api/gen_token/$', views.gen_token),
url(r'^api/transaction/(?P<user_id>\w+)/$', views.transaction),
# url(r'^api/gen_token/$', views.gen_token),
url(r'^api/transactions/(?P<user_id>\w+)/$', views.multiple_transaction),
url(r'^api/products/(?P<prod_id>\w+)/barcode/$', views.addBarcode),
]
www/web/warppay/views.py
View file @ d34c3322
......@@ -13,30 +13,46 @@ from rest_framework import status
# logging.getLogger('main').info(token.key)
@api_view(['GET', 'PUT'])
#@authentication_classes((TokenAuthentication,))
#@permission_classes((IsAuthenticated,))
@api_view(['GET'])
@authentication_classes((TokenAuthentication,))
@permission_classes((IsAuthenticated,))
def category_list(request):
if request.method == 'GET':
products = ProductCategory.objects.all()
serializer = ProductCategorySerializer(products,context={'request': request}, many=True)
serializer = ProductCategorySerializer(products, context={'request': request}, many=True)
return Response(serializer.data)
return Response()
@api_view(['GET', 'PUT'])
#@authentication_classes((TokenAuthentication,))
#@permission_classes((IsAuthenticated,))
@authentication_classes((TokenAuthentication,))
@permission_classes((IsAuthenticated,))
def product_list(request):
if request.method == 'GET':
products = Product.objects.all()
serializer = ProductSerializer(products,context={'request': request}, many=True)
serializer = ProductSerializer(products, context={'request': request}, many=True)
return Response(serializer.data)
elif request.method == 'PUT':
return Response()
return Response()
@api_view(['PUT'])
def addBarcode(request, prod_id=0):
if request.method == 'PUT':
try:
product = Product.objects.get(id=prod_id)
except ObjectDoesNotExist:
return Response(status=status.HTTP_404_NOT_FOUND)
if not product.barcode:
product.barcode = request.data['barcode']
product.save()
return Response()
else:
return Response(status=status.HTTP_406_NOT_ACCEPTABLE)
else:
return Response(status=status.HTTP_406_NOT_ACCEPTABLE)
@api_view(['GET'])
def gen_token(request):
......@@ -46,8 +62,8 @@ def gen_token(request):
return Response()
@api_view(['GET', 'PUT'])
#@authentication_classes((TokenAuthentication,))
#@permission_classes((IsAuthenticated,))
@authentication_classes((TokenAuthentication,))
@permission_classes((IsAuthenticated,))
def user_list(request, user_id = 0):
if request.method == 'GET':
sync_users()
......@@ -99,13 +115,12 @@ def user_list(request, user_id = 0):
return Response(serializer.data, status=state)
return Response()
@api_view(['PUT'])
#@authentication_classes((TokenAuthentication,))
#@permission_classes((IsAuthenticated,))
def transaction(request, user_id=None):
@authentication_classes((TokenAuthentication,))
@permission_classes((IsAuthenticated,))
def multiple_transaction(request, user_id=None):
if request.method == 'PUT':
if 'trans_type' not in request.data or not user_id:
if not user_id:
return Response(status=status.HTTP_406_NOT_ACCEPTABLE)
try:
......@@ -113,44 +128,66 @@ def transaction(request, user_id=None):
except ObjectDoesNotExist:
return Response(status=status.HTTP_404_NOT_FOUND)
transactions = []
products = []
for transact in request.data:
if 'trans_type' not in transact:
return Response(status=status.HTTP_406_NOT_ACCEPTABLE)
t = Transaction()
t.type = int(request.data['trans_type'])
t.type = int(transact['trans_type'])
if t.type == 1:
if 'amount' not in request.data or ('amount' in request.data and float(request.data['amount'] < 0)):
if 'amount' not in transact or ('amount' in transact and float(transact['amount'] < 0)):
return Response(status=status.HTTP_406_NOT_ACCEPTABLE)
if 'cash_paid' in request.data:
t.cash_paid = bool(request.data['cash_paid'])
if 'cash_paid' in transact:
t.cash_paid = bool(transact['cash_paid'])
else:
t.cash_paid = True
t.amount = float(request.data['amount'])
u.credit +=t.amount
t.amount = float(transact['amount'])
u.credit += t.amount
elif t.type == 2:
try:
product = Product.objects.get(id=request.data['product']['id'])
product = Product.objects.get(id=transact['product']['id'])
t.product = product
if 'cash_paid' in request.data:
t.cash_paid = bool(request.data['cash_paid'])
if 'cash_paid' in transact:
t.cash_paid = bool(transact['cash_paid'])
t.amount = product.price_vk
u.credit -= t.amount
if not t.cash_paid:
u.credit -= t.amount
product.stock_count -= 1
products.append(product)
except:
return Response(status=status.HTTP_406_NOT_ACCEPTABLE)
else:
return Response(status=status.HTTP_406_NOT_ACCEPTABLE)
transactions.append(t)
for t in transactions:
t.save()
u.save()
return Response()
print(t)
for p in products:
p.save()
print(p)
u.save()
print(u)
return Response()
def sync_users():
for user in LdapUser.objects.all():
for ldapuser in LdapUser.objects.all():
try:
u = UserCredit.objects.get(uid=user.uid)
if user.card_id:
u.card_id = user.card_id
u = UserCredit.objects.get(uid=ldapuser.uid)
if ldapuser.card_id:
u.card_id = ldapuser.card_id
u.save()
if ldapuser.pinCode:
u.pinCode = ldapuser.pinCode
u.save()
except ObjectDoesNotExist:
u = UserCredit(uid=user.uid, card_id=user.card_id, credit=0.0)
u = UserCredit(uid=ldapuser.uid, card_id=ldapuser.card_id, pinCode="", credit=0.0)
u.save()
www/web/warpservice/__init__.py 0 → 100644
View file @ d34c3322