diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug index 1d3bbc0..7bd758a 100644 --- a/src/pug/templates/macros.pug +++ b/src/pug/templates/macros.pug @@ -328,9 +328,9 @@ script#macros-template(type="text/x-template") button.submit-macros(title="Cancel Macros",@click="cancelMacros", style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Cancel - //- button.submit-macros(title="Cancel Macros",@click="printState", - //- style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Print State - //- button.submit-macros(title="Cancel Macros",@click="printConfig", - //- style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Print Config - //- button.submit-macros(title="Cancel Macros",@click="resetMacrosList", - //- style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Reset Macros List + button.submit-macros(title="Cancel Macros",@click="printState", + style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Print State + button.submit-macros(title="Cancel Macros",@click="printConfig", + style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Print Config + button.submit-macros(title="Cancel Macros",@click="resetMacrosList", + style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Reset Macros List diff --git a/src/py/bbctrl/FileHandler.py b/src/py/bbctrl/FileHandler.py index 578398e..243ec70 100644 --- a/src/py/bbctrl/FileHandler.py +++ b/src/py/bbctrl/FileHandler.py @@ -87,8 +87,11 @@ class FileHandler(bbctrl.APIHandler): if not os.path.exists(self.get_upload()): os.mkdir(self.get_upload()) + self.get_log('FileHandler').info('uploadFilename ' + self.uploadFilename) filename = self.get_upload(self.uploadFilename).encode('utf8') + self.get_log('FileHandler').info('uploadFilename ' + filename) safe_remove(filename) + self.get_log('FileHandler').info('uploadFile.name ' + self.uploadFile.name) os.link(self.uploadFile.name, filename) self.uploadFile.close() diff --git a/src/py/bbctrl/State.py b/src/py/bbctrl/State.py index 2c383ff..6e55c56 100644 --- a/src/py/bbctrl/State.py +++ b/src/py/bbctrl/State.py @@ -157,6 +157,7 @@ class State(object): def add_file(self, filename): + self.log.info('filename %s' % filename) files = copy.deepcopy(self.get('files')) if not filename in files: files.append(filename)