Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for template name collision bug. #2087

Merged
merged 3 commits into from Aug 15, 2016
Merged

Fix for template name collision bug. #2087

merged 3 commits into from Aug 15, 2016

Conversation

@jccosta
Copy link
Contributor

@jccosta jccosta commented Aug 12, 2016

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

@cdatrobot
Copy link

@cdatrobot cdatrobot commented Aug 12, 2016

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
Contributor Author

@jccosta jccosta commented Aug 12, 2016

Removed whitespaces.

@cdatrobot
Copy link

@cdatrobot cdatrobot commented Aug 12, 2016

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
Contributor Author

@jccosta 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

@cdatrobot cdatrobot commented Aug 12, 2016

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

@@ -229,7 +229,7 @@ def clean(self):
self.x.removeP(t)
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
Contributor

@doutriaux1 doutriaux1 Aug 15, 2016

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

@doutriaux1 doutriaux1 merged commit f0f4dc1 into CDAT:master Aug 15, 2016
1 of 2 checks passed
chaosphere2112 pushed a commit that referenced this issue 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
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants