Skip to content

Fix for template name collision bug.#2087

Merged
doutriaux1 merged 3 commits intoCDAT:masterfrom
jccosta:master
Aug 15, 2016
Merged

Fix for template name collision bug.#2087
doutriaux1 merged 3 commits intoCDAT:masterfrom
jccosta:master

Conversation

@jccosta
Copy link
Copy Markdown
Contributor

@jccosta jccosta commented Aug 12, 2016

Fix for avoiding name cached for templates created by EzTempla and TemplateFactory.

@cdatrobot
Copy link
Copy Markdown

Basic content checks failed!

commit d8b3f677 adds bad whitespace:
Packages/vcsaddons/Lib/Multi.py:268: trailing whitespace.
+        else:             
Packages/vcsaddons/Lib/Multi.py:270: trailing whitespace.
+             

Branch-at: d8b3f67
Rejected-by: @llnlbot

@jccosta
Copy link
Copy Markdown
Contributor Author

jccosta commented Aug 12, 2016

Removed whitespaces.

@cdatrobot
Copy link
Copy Markdown

Basic content checks failed!

commit d8b3f677 adds bad whitespace:
Packages/vcsaddons/Lib/Multi.py:268: trailing whitespace.
+        else:             
Packages/vcsaddons/Lib/Multi.py:270: trailing whitespace.
+             

Changes since last check: compare

Branch-at: 35690d6
Rejected-by: @llnlbot

@jccosta
Copy link
Copy Markdown
Contributor Author

jccosta commented Aug 12, 2016

Updated alignment and removed all whitespace (emacs says so. (-: )
This is a way to increase the "uniqueness" of the template names and so avoid cached names to collide.

@cdatrobot
Copy link
Copy Markdown

Basic content checks failed!

commit d8b3f677 adds bad whitespace:
Packages/vcsaddons/Lib/Multi.py:268: trailing whitespace.
+        else:             
Packages/vcsaddons/Lib/Multi.py:270: trailing whitespace.
+             

Changes since last check: compare

Branch-at: ac0bd46
Rejected-by: @llnlbot

self.template_names=[]

def get(self,column=None,row=None,legend=None,font=True,fontlimit=0.8):
def get(self,column=None,row=None,legend=None,font=True,fontlimit=0.8,tname=None):
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tname is not a great name but I'm fine with it.

@doutriaux1 doutriaux1 merged commit f0f4dc1 into CDAT:master Aug 15, 2016
chaosphere2112 pushed a commit that referenced this pull request Sep 1, 2016
* Fix for template name collision bug.

* Removed whitespaces.

* Fixed alignment and whitespaces.(Again).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants